- fix warnings with etag caching at shutdown

[m6w6/ext-http] / http_cache_api.c

diff --git a/http_cache_api.c b/http_cache_api.c
index 0c96f4a2593059fa274c214eb0f9e6f56b26e025..1c967895ad80e35e285fd1b38719c761cca017bf 100644 (file)
--- a/http_cache_api.c
+++ b/http_cache_api.c
@@ -33,8 +33,37 @@
 #include "php_http_send_api.h"
 #include "php_http_date_api.h"
 
+#ifdef HTTP_HAVE_MHASH
+#      include <mhash.h>
+#endif
+
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
+STATUS _http_cache_global_init(INIT_FUNC_ARGS)
+{
+       HTTP_LONG_CONSTANT("HTTP_ETAG_MD5", HTTP_ETAG_MD5);
+       HTTP_LONG_CONSTANT("HTTP_ETAG_SHA1", HTTP_ETAG_SHA1);
+       HTTP_LONG_CONSTANT("HTTP_ETAG_CRC32", HTTP_ETAG_CRC32);
+
+#ifdef HTTP_HAVE_MHASH
+       {
+               int l, i, c = mhash_count();
+               
+               for (i = 0; i <= c; ++i) {
+                       char const_name[256] = {0};
+                       const char *hash_name = mhash_get_hash_name_static(i);
+                       
+                       if (hash_name) {
+                               l = snprintf(const_name, 255, "HTTP_ETAG_MHASH_%s", hash_name);
+                               zend_register_long_constant(const_name, l + 1, i, CONST_CS|CONST_PERSISTENT, module_number TSRMLS_CC);
+                       }
+               }
+       }
+#endif
+
+       return SUCCESS;
+}
+
 /* {{{ char *http_etag(void *, size_t, http_send_mode) */
 PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_mode data_mode TSRMLS_DC)
 {
@@ -180,17 +209,16 @@ PHP_HTTP_API STATUS _http_cache_etag(const char *etag, size_t etag_len,
                }
                return SUCCESS;
        }
-
-       /* if no etag is given and we didn't already start ob_etaghandler -- start it */
-       if (HTTP_G(etag).started) {
-               return SUCCESS;
-       }
-
-       if (HTTP_G(etag).started = (SUCCESS == php_start_ob_buffer_named("ob_etaghandler", HTTP_SENDBUF_SIZE, 1 TSRMLS_CC))) {
-               return SUCCESS;
-       } else {
+       
+       /* already running? */
+       if (php_ob_handler_used("ob_etaghandler" TSRMLS_CC)) {
+               http_error(HE_WARNING, HTTP_E_RUNTIME, "ob_etaghandler can only be used once");
                return FAILURE;
        }
+       
+       /* we want the etag handler to run */
+       HTTP_G(etag).started = 1;
+       return php_start_ob_buffer_named("ob_etaghandler", HTTP_G(send).buffer_size, 1 TSRMLS_CC);
 }
 /* }}} */
 
@@ -198,42 +226,36 @@ PHP_HTTP_API STATUS _http_cache_etag(const char *etag, size_t etag_len,
 PHP_HTTP_API void _http_ob_etaghandler(char *output, uint output_len,
        char **handled_output, uint *handled_output_len, int mode TSRMLS_DC)
 {
-       char etag[41] = { 0 };
-       unsigned char digest[20];
-
-       if (mode & PHP_OUTPUT_HANDLER_START) {
-               if (HTTP_G(etag).started) {
-                       http_error(HE_WARNING, HTTP_E_RUNTIME, "ob_etaghandler can only be used once");
-                       return;
+       /* passthru */
+       *handled_output_len = output_len;
+       *handled_output = estrndup(output, output_len);
+       
+       /* are we supposed to run? */
+       if (HTTP_G(etag).started) {
+               /* initialize the etag context */
+               if (mode & PHP_OUTPUT_HANDLER_START) {
+                       HTTP_G(etag).ctx = http_etag_init();
                }
-               HTTP_G(etag).started = 1;
-               HTTP_G(etag).ctx = http_etag_init();
-       }
-
-       http_etag_update(HTTP_G(etag).ctx, output, output_len);
-
-       if (mode & PHP_OUTPUT_HANDLER_END) {
-               char *etag = http_etag_finish(HTTP_G(etag).ctx);
                
-               /* just do that if desired */
-               if (HTTP_G(etag).started) {
+               /* update */
+               http_etag_update(HTTP_G(etag).ctx, output, output_len);
+               
+               /* finish */
+               if (mode & PHP_OUTPUT_HANDLER_END) {
                        char *sent_header = NULL;
+                       char *etag = http_etag_finish(HTTP_G(etag).ctx);
                        
                        http_send_cache_control(HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL));
                        http_send_etag_ex(etag, strlen(etag), &sent_header);
                        
                        if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) {
-                               efree(etag);
-                               http_exit_ex(304, sent_header, NULL, 0);
-                       } else {
-                               STR_FREE(sent_header);
+                               http_exit_ex(304, sent_header, etag, 0);
                        }
+                       
+                       STR_FREE(sent_header);
+                       STR_FREE(etag);
                }
-               efree(etag);
        }
-
-       *handled_output_len = output_len;
-       *handled_output = estrndup(output, output_len);
 }
 /* }}} */