summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@php.net>2007-10-17 11:18:34 +0000
committerDmitry Stogov <dmitry@php.net>2007-10-17 11:18:34 +0000
commitaf76115fe5dbe728d4b6c48716a4c7c8f0dc58a8 (patch)
tree713e94289426b4ad485dbb3bc36160952c80e5d0
parentcb0991bb85ace61615935520fefd3f8917b37919 (diff)
downloadphp-git-af76115fe5dbe728d4b6c48716a4c7c8f0dc58a8.tar.gz
Fixed bug #42637 (SoapFault : Only http and https are allowed). (Bill Moran)
-rw-r--r--NEWS1
-rw-r--r--ext/soap/php_http.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 2987f39a0e..fa9108a9f0 100644
--- a/NEWS
+++ b/NEWS
@@ -50,6 +50,7 @@ PHP NEWS
- Fixed bug #42737 (preg_split('//u') triggers a E_NOTICE with newlines). (Nuno)
- Fixed bug #42657 (ini_get() returns incorrect value when default is NULL).
(Jani)
+- Fixed bug #42637 (SoapFault : Only http and https are allowed). (Bill Moran)
- Fixed bug #42069 (parse_ini_file() allows using some non-alpha numeric
characters). (Jani)
- Fixed bug #37911 (preg_replace_callback() ignores named groups). (Nuno)
diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c
index a868a41efe..282dfdbafc 100644
--- a/ext/soap/php_http.c
+++ b/ext/soap/php_http.c
@@ -918,7 +918,7 @@ try_again:
efree(http_body);
efree(loc);
if (new_url->scheme == NULL && new_url->path != NULL) {
- new_url->scheme = NULL;
+ new_url->scheme = phpurl->scheme ? estrdup(phpurl->scheme) : NULL;
new_url->host = phpurl->host ? estrdup(phpurl->host) : NULL;
new_url->port = phpurl->port;
if (new_url->path && new_url->path[0] != '/') {