- Fixed bug #48590 (SoapClient does not honor max_redirects)

diff --git a/NEWS b/NEWS
index ee8df5944d9174624fd8fdf9b1068e8cd19b7d18..16cbfcfa9f47c006dd57fc9a00bd73fcfd0239ce 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,7 @@ PHP                                                                        NEWS
   (Jani)
 - Fixed bug #50394 (Reference argument converted to value in __call). (Stas)
 - Fixed bug #49851 (http wrapper breaks on 1024 char long headers). (Ilia)
+- Fixed bug #48590 (SoapClient does not honor max_redirects). (Sriram)
 - Fixed bug #48190 (Content-type parameter "boundary" is not case-insensitive
   in HTTP uploads). (Ilia)
 - Fixed bug #47409 (extract() problem with array containing word "this").

diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c
index f5350c6526f9e00a3e668a51e19e617f99cc7d9b..7dbf40a6734c1b7413ba172c93a2d5724772bce7 100644 (file)
--- a/ext/soap/php_http.c
+++ b/ext/soap/php_http.c
@@ -237,9 +237,11 @@ int make_http_soap_request(zval  *this_ptr,
        int http_1_1;
        int http_status;
        int content_type_xml = 0;
+       long redirect_max = 20;
        char *content_encoding;
        char *http_msg = NULL;
        zend_bool old_allow_url_fopen;
+       php_stream_context *context = NULL;
 
        if (this_ptr == NULL || Z_TYPE_P(this_ptr) != IS_OBJECT) {
                return FALSE;
@@ -307,6 +309,19 @@ int make_http_soap_request(zval  *this_ptr,
                phpurl = php_url_parse(location);
        }
 
+       if (SUCCESS == zend_hash_find(Z_OBJPROP_P(this_ptr),
+                       "_stream_context", sizeof("_stream_context"), (void**)&tmp)) {
+               context = php_stream_context_from_zval(*tmp, 0);
+       }
+
+       if (context && 
+               php_stream_context_get_option(context, "http", "max_redirects", &tmp) == SUCCESS) {
+               if (Z_TYPE_PP(tmp) != IS_STRING || !is_numeric_string(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp), &redirect_max, NULL, 1)) {
+                       if (Z_TYPE_PP(tmp) == IS_LONG)
+                               redirect_max = Z_LVAL_PP(tmp);
+               }
+       }
+
 try_again:
        if (phpurl == NULL || phpurl->host == NULL) {
          if (phpurl != NULL) {php_url_free(phpurl);}
@@ -953,6 +968,12 @@ try_again:
                                }
                                phpurl = new_url;
 
+                               if (--redirect_max < 1) {
+                                       smart_str_free(&soap_headers_z);
+                                       add_soap_fault(this_ptr, "HTTP", "Redirection limit reached, aborting", NULL, NULL TSRMLS_CC);
+                                       return FALSE;
+                               }
+
                                goto try_again;
                        }
                }