pajoye                                   Mon, 23 Aug 2010 18:05:05 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=302717

Log:
-fix logic (and BC break)

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c
    U   php/php-src/trunk/ext/standard/http_fopen_wrapper.c

Modified: php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c      
2010-08-23 17:16:17 UTC (rev 302716)
+++ php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c      
2010-08-23 18:05:05 UTC (rev 302717)
@@ -678,7 +678,7 @@
        }

        if (!reqok || (location[0] != '\0' && follow_location)) {
-               if (!follow_location && (((options & STREAM_ONLY_GET_HEADERS) 
|| ignore_errors) && redirect_max <= 1)) {
+               if (!follow_location || (((options & STREAM_ONLY_GET_HEADERS) 
|| ignore_errors) && redirect_max <= 1)) {
                        goto out;
                }


Modified: php/php-src/trunk/ext/standard/http_fopen_wrapper.c
===================================================================
--- php/php-src/trunk/ext/standard/http_fopen_wrapper.c 2010-08-23 17:16:17 UTC 
(rev 302716)
+++ php/php-src/trunk/ext/standard/http_fopen_wrapper.c 2010-08-23 18:05:05 UTC 
(rev 302717)
@@ -678,7 +678,7 @@
        }

        if (!reqok || (location[0] != '\0' && follow_location)) {
-               if (!follow_location && (((options & STREAM_ONLY_GET_HEADERS) 
|| ignore_errors) && redirect_max <= 1)) {
+               if (!follow_location || (((options & STREAM_ONLY_GET_HEADERS) 
|| ignore_errors) && redirect_max <= 1)) {
                        goto out;
                }


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

Reply via email to