From 6326528127e06cfa5cf65b571dddb01183af137b Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Mon, 23 Aug 2010 16:54:57 +0000 Subject: [PATCH] - add follow_location support for http stream, enabled by default to keep BC. Allows one to ignore the location header, w/o having to ignore errors or other tricks, the location data is however still available (meta) --- NEWS | 2 ++ ext/standard/http_fopen_wrapper.c | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 1c05eddfe6..ed67964049 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,8 @@ - Upgraded bundled Sqlite3 to version 3.7.0.1. (Ilia) - Upgraded bundled PCRE to version 8.10. (Ilia) +- Added follow_location (enabled by default) option for the http stream support. + (Pierre) - Added new character sets to mysqlnd, which are available in MySQL 5.5 (Andrey) diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c index 29db7f26d0..ca76027ff2 100644 --- a/ext/standard/http_fopen_wrapper.c +++ b/ext/standard/http_fopen_wrapper.c @@ -111,6 +111,7 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path, char *user_headers = NULL; int header_init = ((flags & HTTP_WRAPPER_HEADER_INIT) != 0); int redirected = ((flags & HTTP_WRAPPER_REDIRECTED) != 0); + int follow_location = 1; php_stream_filter *transfer_encoding = NULL; tmp_line[0] = '\0'; @@ -628,6 +629,11 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path, http_header_line[http_header_line_length] = '\0'; if (!strncasecmp(http_header_line, "Location: ", 10)) { + if (context && php_stream_context_get_option(context, "http", "follow_location", &tmpzval) == SUCCESS) { + SEPARATE_ZVAL(tmpzval); + convert_to_long_ex(tmpzval); + follow_location = Z_LVAL_PP(tmpzval); + } strlcpy(location, http_header_line + 10, sizeof(location)); } else if (!strncasecmp(http_header_line, "Content-Type: ", 14)) { php_stream_notify_info(context, PHP_STREAM_NOTIFY_MIME_TYPE_IS, http_header_line + 14, 0); @@ -670,9 +676,9 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path, break; } } - - if (!reqok || location[0] != '\0') { - if (((options & STREAM_ONLY_GET_HEADERS) || ignore_errors) && redirect_max <= 1) { + + if (!reqok || (location[0] != '\0' && follow_location)) { + if (!follow_location && (((options & STREAM_ONLY_GET_HEADERS) || ignore_errors) && redirect_max <= 1)) { goto out; } -- 2.40.0