Fixed bug #60887 (SoapClient ignores user_agent option and sends no User-Agent header)

diff --git a/NEWS b/NEWS
index 770f2b601cb36214bc5e7daad3327eac1e9d18ee..224c0db2bcbffceae2b3a61a53dac6db2635057e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -41,7 +41,11 @@ PHP                                                                        NEWS
 
 - PHP-FPM SAPI:
   . Fixed bug #60811 (php-fpm compilation problem). (rasmus)
- 
+
+- SOAP
+  . Fixed bug #60887 (SoapClient ignores user_agent option and sends no
+    User-Agent header). (carloschilazo at gmail dot com)
+    
 - SQLite3 extension:
   . Add createCollation() method. (Brad Dewar)
 

diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c
index 370b1fa04b47c905507140fbbb8f88f56e3c44ba..45aee30ac1ebeadc48746abf9b930951460e874b 100644 (file)
--- a/ext/soap/php_sdl.c
+++ b/ext/soap/php_sdl.c
@@ -3259,6 +3259,13 @@ sdlPtr get_sdl(zval *this_ptr, char *uri, long cache_wsdl TSRMLS_DC)
                context = php_stream_context_alloc();
        }
 
+       if (zend_hash_find(Z_OBJPROP_P(this_ptr), "_user_agent", sizeof("_user_agent"), (void **) &tmp) == SUCCESS &&
+           Z_TYPE_PP(tmp) == IS_STRING && Z_STRLEN_PP(tmp) > 0) {      
+               smart_str_appends(&headers, "User-Agent: ");
+               smart_str_appends(&headers, Z_STRVAL_PP(tmp));
+               smart_str_appends(&headers, "\r\n");
+       }
+
        if (zend_hash_find(Z_OBJPROP_P(this_ptr), "_proxy_host", sizeof("_proxy_host"), (void **) &proxy_host) == SUCCESS &&
            Z_TYPE_PP(proxy_host) == IS_STRING &&
            zend_hash_find(Z_OBJPROP_P(this_ptr), "_proxy_port", sizeof("_proxy_port"), (void **) &proxy_port) == SUCCESS &&