Avoid problems with chunk_size and auto_detect_line_endings.

diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c
index 12482895b34bac1aa8add29aae04df6b7aacadb9..b6ad96415c028f88525781fa9df74985e9e212dd 100644 (file)
--- a/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@ -100,6 +100,7 @@ php_stream *php_stream_url_wrap_http(php_stream_wrapper *wrapper, char *path, ch
        char *http_header_line = NULL;
        char tmp_line[128];
        size_t chunk_size = 0, file_size = 0;
+       int eol_detect;
 
        if (strchr(mode, 'a') || strchr(mode, '+') || strchr(mode, 'w')) {
                php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "HTTP wrapper does not support writeable connections.");
@@ -123,8 +124,14 @@ php_stream *php_stream_url_wrap_http(php_stream_wrapper *wrapper, char *path, ch
                goto out;
 
        /* avoid buffering issues while reading header */
-       chunk_size = php_stream_set_chunk_size(stream, 1);
+       if (options & STREAM_WILL_CAST)
+               chunk_size = php_stream_set_chunk_size(stream, 1);
        
+       /* avoid problems with auto-detecting when reading the headers -> the headers
+        * are always in canonical \r\n format */
+       eol_detect = stream->flags & (PHP_STREAM_FLAG_DETECT_EOL | PHP_STREAM_FLAG_EOL_MAC);
+       stream->flags &= ~(PHP_STREAM_FLAG_DETECT_EOL | PHP_STREAM_FLAG_EOL_MAC);
+
        php_stream_context_set(stream, context);
 
        php_stream_notify_info(context, PHP_STREAM_NOTIFY_CONNECT, NULL, 0);
@@ -400,7 +407,12 @@ out:
                stream->wrapperdata = response_header;
                php_stream_notify_progress_init(context, 0, file_size);
                /* Restore original chunk size now that we're done with headers */
-               php_stream_set_chunk_size(stream, chunk_size);
+               if (options & STREAM_WILL_CAST)
+                       php_stream_set_chunk_size(stream, chunk_size);
+
+               /* restore the users auto-detect-line-endings setting */
+               stream->flags |= eol_detect;
+               
                /* as far as streams are concerned, we are now at the start of
                 * the stream */
                stream->position = 0;