dmitry Wed, 01 Feb 2012 12:16:52 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=322993
Log:
Fixed basic HTTP authentication for WSDL sub requests.
Changed paths:
U php/php-src/branches/PHP_5_3/ext/soap/php_sdl.c
U php/php-src/branches/PHP_5_4/ext/soap/php_sdl.c
U php/php-src/trunk/ext/soap/php_sdl.c
Modified: php/php-src/branches/PHP_5_3/ext/soap/php_sdl.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/soap/php_sdl.c 2012-02-01 11:26:57 UTC
(rev 322992)
+++ php/php-src/branches/PHP_5_3/ext/soap/php_sdl.c 2012-02-01 12:16:52 UTC
(rev 322993)
@@ -237,11 +237,11 @@
s = strstr(ctx->sdl->source, "://");
if (!s) return;
s = strchr(s+3, '/');
- l1 = s - ctx->sdl->source;
+ l1 = s ? (s - ctx->sdl->source) : strlen(ctx->sdl->source);
s = strstr((char*)uri, "://");
if (!s) return;
s = strchr(s+3, '/');
- l2 = s - (char*)uri;
+ l2 = s ? (s - (char*)uri) : strlen((char*)uri);
if (l1 != l2) {
/* check for http://...:80/ */
if (l1 > 11 &&
Modified: php/php-src/branches/PHP_5_4/ext/soap/php_sdl.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/soap/php_sdl.c 2012-02-01 11:26:57 UTC
(rev 322992)
+++ php/php-src/branches/PHP_5_4/ext/soap/php_sdl.c 2012-02-01 12:16:52 UTC
(rev 322993)
@@ -237,11 +237,11 @@
s = strstr(ctx->sdl->source, "://");
if (!s) return;
s = strchr(s+3, '/');
- l1 = s - ctx->sdl->source;
+ l1 = s ? (s - ctx->sdl->source) : strlen(ctx->sdl->source);
s = strstr((char*)uri, "://");
if (!s) return;
s = strchr(s+3, '/');
- l2 = s - (char*)uri;
+ l2 = s ? (s - (char*)uri) : strlen((char*)uri);
if (l1 != l2) {
/* check for http://...:80/ */
if (l1 > 11 &&
Modified: php/php-src/trunk/ext/soap/php_sdl.c
===================================================================
--- php/php-src/trunk/ext/soap/php_sdl.c 2012-02-01 11:26:57 UTC (rev
322992)
+++ php/php-src/trunk/ext/soap/php_sdl.c 2012-02-01 12:16:52 UTC (rev
322993)
@@ -237,11 +237,11 @@
s = strstr(ctx->sdl->source, "://");
if (!s) return;
s = strchr(s+3, '/');
- l1 = s - ctx->sdl->source;
+ l1 = s ? (s - ctx->sdl->source) : strlen(ctx->sdl->source);
s = strstr((char*)uri, "://");
if (!s) return;
s = strchr(s+3, '/');
- l2 = s - (char*)uri;
+ l2 = s ? (s - (char*)uri) : strlen((char*)uri);
if (l1 != l2) {
/* check for http://...:80/ */
if (l1 > 11 &&
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
