cvs: php-src(PHP_4_3) /ext/curl curlstreams.c

pollita Tue Aug 31 16:12:56 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/curl curlstreams.c Log: MFH: Use user_agent ini setting if it's available. http://cvs.php.net/diff.php/php-src/ext/curl/curlstreams.c?r1=1.2.2.2&r2=1.2.2.3&ty=u Index: php-src/ext/curl/curlstreams.c diff -u php-src/ext/curl/curlstreams.c:1.2.2.2 php-src/ext/curl/curlstreams.c:1.2.2.3 --- php-src/ext/curl/curlstreams.c:1.2.2.2 Tue Dec 31 11:34:15 2002 +++ php-src/ext/curl/curlstreams.c Tue Aug 31 16:12:56 2004 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: curlstreams.c,v 1.2.2.2 2002/12/31 16:34:15 sebastian Exp $ */ +/* $Id: curlstreams.c,v 1.2.2.3 2004/08/31 20:12:56 pollita Exp $ */ /* This file implements cURL based wrappers. * NOTE: If you are implementing your own streams that are intended to @@ -307,7 +307,7 @@ curl_easy_setopt(curlstream->curl, CURLOPT_PROGRESSDATA, stream); curl_easy_setopt(curlstream->curl, CURLOPT_NOPROGRESS, 0); - curl_easy_setopt(curlstream->curl, CURLOPT_USERAGENT, "PHP/" PHP_VERSION); + curl_easy_setopt(curlstream->curl, CURLOPT_USERAGENT, FG(user_agent) ? FG(user_agent) : "PHP/" PHP_VERSION); /* TODO: read cookies and options from context */