iliaa           Mon Jan 19 21:57:47 2009 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/soap   php_http.c 
    /php-src    NEWS 
  Log:
  Fixed bug #47131 (SOAP Extension ignores "user_agent" ini setting).
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_http.c?r1=1.77.2.11.2.16&r2=1.77.2.11.2.17&diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.77.2.11.2.16 
php-src/ext/soap/php_http.c:1.77.2.11.2.17
--- php-src/ext/soap/php_http.c:1.77.2.11.2.16  Wed Dec 31 11:17:43 2008
+++ php-src/ext/soap/php_http.c Mon Jan 19 21:57:45 2009
@@ -17,7 +17,7 @@
   |          Dmitry Stogov <dmi...@zend.com>                             |
   +----------------------------------------------------------------------+
 */
-/* $Id: php_http.c,v 1.77.2.11.2.16 2008/12/31 11:17:43 sebastian Exp $ */
+/* $Id: php_http.c,v 1.77.2.11.2.17 2009/01/19 21:57:45 iliaa Exp $ */
 
 #include "php_soap.h"
 #include "ext/standard/base64.h"
@@ -438,7 +438,11 @@
                                smart_str_appendl(&soap_headers, 
Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp));
                                smart_str_append_const(&soap_headers, "\r\n");
                        }
-               } else{
+               } else if (FG(user_agent)) {
+                       smart_str_append_const(&soap_headers, "User-Agent: ");
+                       smart_str_appends(&soap_headers, FG(user_agent));
+                       smart_str_append_const(&soap_headers, "\r\n");
+               } else {
                        smart_str_append_const(&soap_headers, "User-Agent: 
PHP-SOAP/"PHP_VERSION"\r\n");
                }
 
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1396&r2=1.2027.2.547.2.1397&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1396 php-src/NEWS:1.2027.2.547.2.1397
--- php-src/NEWS:1.2027.2.547.2.1396    Sun Jan 18 23:51:15 2009
+++ php-src/NEWS        Mon Jan 19 21:57:46 2009
@@ -17,6 +17,7 @@
 - Fixed bug in xml_error_string() which resulted in messages being
   off by one. (Scott)
 
+- Fixed bug #47131 (SOAP Extension ignores "user_agent" ini setting). (Ilia)
 - Fixed bug #47104 (Linking shared extensions fails with icc). (Jani)
 - Fixed bug #47109 (Memory leak on $a->{"a"."b"} when $a is not an object).
   (Etienne, Dmitry)



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

Reply via email to