- use a more iterative approach in inflate code (instead of a retry-style)

[m6w6/ext-http] / http_cache_api.c

diff --git a/http_cache_api.c b/http_cache_api.c
index 582c3ccd455d764b26fcec0134ec58dff88080ea..9fce65059988eebaea0606b7c462e5b7ea17e665 100644 (file)
--- a/http_cache_api.c
+++ b/http_cache_api.c
@@ -185,7 +185,7 @@ PHP_HTTP_API STATUS _http_start_ob_etaghandler(TSRMLS_D)
        }
        
        HTTP_G->etag.started = 1;
-       return php_start_ob_buffer_named("ob_etaghandler", HTTP_G->send.buffer_size, 1 TSRMLS_CC);
+       return php_start_ob_buffer_named("ob_etaghandler", HTTP_G->send.buffer_size, 0 TSRMLS_CC);
 }
 
 PHP_HTTP_API zend_bool _http_interrupt_ob_etaghandler(TSRMLS_D)
@@ -230,6 +230,8 @@ void _http_ob_etaghandler(char *output, uint output_len,
                        http_send_etag_ex(etag, strlen(etag), &sent_header);
                        
                        if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) {
+                               /* force exit; ob within ob does not work */
+                               HTTP_G->force_exit = 1;
                                http_exit_ex(304, sent_header, etag, 0);
                        }