--- embedaddon/php/ext/curl/streams.c 2012/02/21 23:47:53 1.1 +++ embedaddon/php/ext/curl/streams.c 2012/05/29 12:34:36 1.1.1.2 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streams.c,v 1.1 2012/02/21 23:47:53 misho Exp $ */ +/* $Id: streams.c,v 1.1.1.2 2012/05/29 12:34:36 misho Exp $ */ /* This file implements cURL based wrappers. * NOTE: If you are implementing your own streams that are intended to @@ -395,7 +395,7 @@ php_stream *php_curl_stream_opener(php_stream_wrapper } } if (mr > 1) { - if ((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) { + if (PG(open_basedir) && *PG(open_basedir)) { curl_easy_setopt(curlstream->curl, CURLOPT_FOLLOWLOCATION, 0); } else { curl_easy_setopt(curlstream->curl, CURLOPT_FOLLOWLOCATION, 1); @@ -403,7 +403,7 @@ php_stream *php_curl_stream_opener(php_stream_wrapper curl_easy_setopt(curlstream->curl, CURLOPT_MAXREDIRS, mr); } } else { - if ((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) { + if (PG(open_basedir) && *PG(open_basedir)) { curl_easy_setopt(curlstream->curl, CURLOPT_FOLLOWLOCATION, 0); } else { curl_easy_setopt(curlstream->curl, CURLOPT_FOLLOWLOCATION, 1);