iliaa Sun Oct 31 23:56:10 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/curl curl.c
Log:
MFH: Fixed bug #30613 (Prevent infinite recursion in url redirection).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.747&r2=1.1247.2.748&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.747 php-src/NEWS:1.1247.2.748
--- php-src/NEWS:1.1247.2.747 Wed Oct 27 08:06:13 2004
+++ php-src/NEWS Sun Oct 31 23:56:09 2004
@@ -4,6 +4,7 @@
- Fixed a bug in addslashes() handling of the '\0' character. (Ilia)
- Backported Marcus' foreach() speedup patch from PHP 5.x. (Derick)
- Fixed potential problems with unserializing invalid serialize data. (Marcus)
+- Fixed bug #30613 (Prevent infinite recursion in url redirection). (Ilia)
- Fixed bug #30475 (curl_getinfo() may crash in some situations). (Ilia)
- Fixed bug #30442 (segfault when parsing ?getvariable[][ ). (Tony)
- Fixed bug #30388 (rename across filesystems loses ownership and
http://cvs.php.net/diff.php/php-src/ext/curl/curl.c?r1=1.124.2.26&r2=1.124.2.27&ty=u
Index: php-src/ext/curl/curl.c
diff -u php-src/ext/curl/curl.c:1.124.2.26 php-src/ext/curl/curl.c:1.124.2.27
--- php-src/ext/curl/curl.c:1.124.2.26 Mon Oct 18 18:43:29 2004
+++ php-src/ext/curl/curl.c Sun Oct 31 23:56:10 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: curl.c,v 1.124.2.26 2004/10/18 22:43:29 iliaa Exp $ */
+/* $Id: curl.c,v 1.124.2.27 2004/11/01 04:56:10 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -708,6 +708,7 @@
curl_easy_setopt(ch->cp, CURLOPT_WRITEHEADER, (void *) ch);
curl_easy_setopt(ch->cp, CURLOPT_DNS_USE_GLOBAL_CACHE, 1);
curl_easy_setopt(ch->cp, CURLOPT_DNS_CACHE_TIMEOUT, 120);
+ curl_easy_setopt(ch->cp, CURLOPT_MAXREDIRS, 20); /* prevent infinite redirects
*/
if (argc > 0) {
char *urlcopy;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
