- implement feature request: 'bodyonly' request option;

[m6w6/ext-http] / http_cache_api.c

diff --git a/http_cache_api.c b/http_cache_api.c
index 11609f989fee4132832bc67c7144ff08ee569e13..f8d1bf029fc396e22648b24c7ce3a75720848b67 100644 (file)
--- a/http_cache_api.c
+++ b/http_cache_api.c
@@ -15,52 +15,20 @@
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
 #endif
-#include "php.h"
+
+#include "php_http.h"
 
 #include "SAPI.h"
-#include "php_streams.h"
 #include "php_output.h"
-#include "ext/standard/md5.h"
-#include "ext/standard/sha1.h"
+#include "php_streams.h"
 
-#include "php_http.h"
-#include "php_http_std_defs.h"
 #include "php_http_api.h"
 #include "php_http_cache_api.h"
-#include "php_http_send_api.h"
 #include "php_http_date_api.h"
-
-#ifdef HTTP_HAVE_MHASH
-#      include <mhash.h>
-#endif
+#include "php_http_send_api.h"
 
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
-PHP_MINIT_FUNCTION(http_cache)
-{
-       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)
 {
@@ -79,7 +47,7 @@ PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_m
                }
                
                if (SUCCESS != ss) {
-                       http_etag_free(&ctx);
+                       efree(ctx);
                        return NULL;
                } else {
                        size_t ssb_len;
@@ -92,7 +60,7 @@ PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_m
                }
        }
        
-       return http_etag_finish(&ctx);
+       return http_etag_finish(ctx);
 }
 /* }}} */
 
@@ -120,7 +88,7 @@ PHP_HTTP_API zend_bool _http_match_last_modified_ex(const char *entry, time_t t,
        HTTP_GSC(zmodified, entry, !enforce_presence);
 
        modified = estrndup(Z_STRVAL_P(zmodified), Z_STRLEN_P(zmodified));
-       if (chr_ptr = strrchr(modified, ';')) {
+       if ((chr_ptr = strrchr(modified, ';'))) {
                chr_ptr = 0;
        }
        retval = (t <= http_parse_date(modified));
@@ -160,6 +128,10 @@ PHP_HTTP_API STATUS _http_cache_last_modified(time_t last_modified,
 {
        char *sent_header = NULL;
        
+       if (SG(headers_sent)) {
+               return FAILURE;
+       }
+       
        if (cc_len && (SUCCESS != http_send_cache_control(cache_control, cc_len))) {
                return FAILURE;
        }
@@ -184,6 +156,10 @@ PHP_HTTP_API STATUS _http_cache_etag(const char *etag, size_t etag_len,
 {
        char *sent_header = NULL;
        
+       if (SG(headers_sent)) {
+               return FAILURE;
+       }
+       
        if (cc_len && (SUCCESS != http_send_cache_control(cache_control, cc_len))) {
                return FAILURE;
        }
@@ -221,7 +197,10 @@ PHP_HTTP_API zend_bool _http_interrupt_ob_etaghandler(TSRMLS_D)
 {
        if (HTTP_G(etag).started) {
                HTTP_G(etag).started = 0;
-               http_etag_free(&HTTP_G(etag).ctx);
+               if (HTTP_G(etag).ctx) {
+                       efree(HTTP_G(etag).ctx);
+                       HTTP_G(etag).ctx = NULL;
+               }
                return 1;
        }
        return 0;
@@ -248,7 +227,9 @@ void _http_ob_etaghandler(char *output, uint output_len,
                /* finish */
                if (mode & PHP_OUTPUT_HANDLER_END) {
                        char *sent_header = NULL;
-                       char *etag = http_etag_finish(&HTTP_G(etag).ctx);
+                       char *etag = http_etag_finish(HTTP_G(etag).ctx);
+                       
+                       HTTP_G(etag).ctx = NULL;
                        
                        http_send_cache_control(HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL));
                        http_send_etag_ex(etag, strlen(etag), &sent_header);