MFH(r-1.59)

diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c
index 4ae41fb93c76d399af436f103f6ab63882ca0040..12482895b34bac1aa8add29aae04df6b7aacadb9 100644 (file)
--- a/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@ -123,8 +123,7 @@ php_stream *php_stream_url_wrap_http(php_stream_wrapper *wrapper, char *path, ch
                goto out;
 
        /* avoid buffering issues while reading header */
-       if (options & STREAM_WILL_CAST)
-               chunk_size = php_stream_set_chunk_size(stream, 1);
+       chunk_size = php_stream_set_chunk_size(stream, 1);
        
        php_stream_context_set(stream, context);
 
@@ -400,8 +399,8 @@ out:
        if (stream)     {
                stream->wrapperdata = response_header;
                php_stream_notify_progress_init(context, 0, file_size);
-               if (options & STREAM_WILL_CAST)
-                       php_stream_set_chunk_size(stream, chunk_size);
+               /* Restore original chunk size now that we're done with headers */
+               php_stream_set_chunk_size(stream, chunk_size);
                /* as far as streams are concerned, we are now at the start of
                 * the stream */
                stream->position = 0;