pollita         Tue Aug 31 16:11:19 2004 EDT

  Modified files:              
    /php-src/ext/curl   streams.c 
  Log:
  Use user_agent ini setting if it's available.
  
http://cvs.php.net/diff.php/php-src/ext/curl/streams.c?r1=1.12&r2=1.13&ty=u
Index: php-src/ext/curl/streams.c
diff -u php-src/ext/curl/streams.c:1.12 php-src/ext/curl/streams.c:1.13
--- php-src/ext/curl/streams.c:1.12     Thu Jan  8 03:14:37 2004
+++ php-src/ext/curl/streams.c  Tue Aug 31 16:11:18 2004
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: streams.c,v 1.12 2004/01/08 08:14:37 andi Exp $ */
+/* $Id: streams.c,v 1.13 2004/08/31 20:11:18 pollita Exp $ */
 
 /* This file implements cURL based wrappers.
  * NOTE: If you are implementing your own streams that are intended to
@@ -299,7 +299,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 */
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to