iliaa Thu Aug 10 15:02:41 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/curl streams.c Log: Fixed condition http://cvs.php.net/viewvc.cgi/php-src/ext/curl/streams.c?r1=1.14.2.2.2.4&r2=1.14.2.2.2.5&diff_format=u Index: php-src/ext/curl/streams.c diff -u php-src/ext/curl/streams.c:1.14.2.2.2.4 php-src/ext/curl/streams.c:1.14.2.2.2.5 --- php-src/ext/curl/streams.c:1.14.2.2.2.4 Thu Aug 10 14:40:13 2006 +++ php-src/ext/curl/streams.c Thu Aug 10 15:02:41 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streams.c,v 1.14.2.2.2.4 2006/08/10 14:40:13 iliaa Exp $ */ +/* $Id: streams.c,v 1.14.2.2.2.5 2006/08/10 15:02:41 iliaa Exp $ */ /* This file implements cURL based wrappers. * NOTE: If you are implementing your own streams that are intended to @@ -350,17 +350,17 @@ } if (mr > 1) { if ((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) { - curl_easy_setopt(curlstream->curl, CURLOPT_FOLLOWLOCATION, 1); - } else { curl_easy_setopt(curlstream->curl, CURLOPT_FOLLOWLOCATION, 0); + } else { + curl_easy_setopt(curlstream->curl, CURLOPT_FOLLOWLOCATION, 1); } curl_easy_setopt(curlstream->curl, CURLOPT_MAXREDIRS, mr); } } else { if ((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) { - curl_easy_setopt(curlstream->curl, CURLOPT_FOLLOWLOCATION, 1); - } else { curl_easy_setopt(curlstream->curl, CURLOPT_FOLLOWLOCATION, 0); + } else { + curl_easy_setopt(curlstream->curl, CURLOPT_FOLLOWLOCATION, 1); } curl_easy_setopt(curlstream->curl, CURLOPT_MAXREDIRS, 20L); }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php