- add note about SSL connect errors on windows due to LIB/DLL mismatches
[m6w6/ext-http] / http_cache_api.c
index 9b2b8aacfacbdd3c03171affdb8e054b4a5a7784..6fa1c523cac05804b5b2d5e544f5cf66dbccbfd0 100644 (file)
 
 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)
 {
-       php_stream_statbuf ssb;
-       char ssb_buf[128] = {0};
-       size_t ssb_len;
        void *ctx = http_etag_init();
        
-       switch (data_mode)
-       {
-               case SEND_DATA:
-                       http_etag_update(ctx, data_ptr, data_len);
-               break;
-
-               case SEND_RSRC:
-               {
-                       if (php_stream_stat((php_stream *) data_ptr, &ssb)) {
-                               efree(ctx);
-                               return NULL;
-                       }
-                       ssb_len = snprintf(ssb_buf, 127, "%ld=%ld=%ld", ssb.sb.st_mtime, ssb.sb.st_ino, ssb.sb.st_size);
-                       http_etag_update(ctx, ssb_buf, ssb_len);
+       if (data_mode == SEND_DATA) {
+               http_etag_update(ctx, data_ptr, data_len);
+       } else {
+               STATUS ss = FAILURE;
+               php_stream_statbuf ssb;
+               
+               if (data_mode == SEND_RSRC) {
+                       ss = php_stream_stat((php_stream *) data_ptr, &ssb);
+               } else {
+                       ss = php_stream_stat_path((char *) data_ptr, &ssb);
                }
-               break;
-
-               default:
-               {
-                       if (php_stream_stat_path((char *) data_ptr, &ssb)) {
-                               efree(ctx);
-                               return NULL;
-                       }
-                       ssb_len = snprintf(ssb_buf, 127, "%ld=%ld=%ld", ssb.sb.st_mtime, ssb.sb.st_ino, ssb.sb.st_size);
+               
+               if (SUCCESS != ss) {
+                       http_etag_free(&ctx);
+                       return NULL;
+               } else {
+                       size_t ssb_len;
+                       char ssb_buf[128] = {0};
+                       
+                       ssb_len = snprintf(ssb_buf, 127, "%ld=%ld=%ld", (long) ssb.sb.st_mtime, 
+                                                                                                                       (long) ssb.sb.st_ino, 
+                                                                                                                       (long) ssb.sb.st_size);
                        http_etag_update(ctx, ssb_buf, ssb_len);
                }
-               break;
        }
-
-       return http_etag_finish(ctx);
+       
+       return http_etag_finish(&ctx);
 }
 /* }}} */
 
@@ -126,15 +145,14 @@ PHP_HTTP_API zend_bool _http_match_etag_ex(const char *entry, const char *etag,
                return 1;
        }
 
-       quoted_etag = (char *) emalloc(strlen(etag) + 3);
-       sprintf(quoted_etag, "\"%s\"", etag);
-
+       spprintf(&quoted_etag, 0, "\"%s\"", etag);
        if (!strchr(Z_STRVAL_P(zetag), ',')) {
                result = !strcmp(Z_STRVAL_P(zetag), quoted_etag);
        } else {
                result = (NULL != strstr(Z_STRVAL_P(zetag), quoted_etag));
        }
        efree(quoted_etag);
+       
        return result;
 }
 /* }}} */
@@ -184,57 +202,68 @@ PHP_HTTP_API STATUS _http_cache_etag(const char *etag, size_t etag_len,
                }
                return SUCCESS;
        }
+       
+       /* start ob_etaghandler */
+       return http_start_ob_etaghandler();
+}
+/* }}} */
 
-       /* if no etag is given and we didn't already start ob_etaghandler -- start it */
-       if (HTTP_G(etag).started) {
-               return SUCCESS;
+PHP_HTTP_API STATUS _http_start_ob_etaghandler(TSRMLS_D)
+{
+       /* 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;
        }
+       
+       HTTP_G(etag).started = 1;
+       return php_start_ob_buffer_named("ob_etaghandler", HTTP_G(send).buffer_size, 1 TSRMLS_CC);
+}
 
-       if (HTTP_G(etag).started = (SUCCESS == php_start_ob_buffer_named("ob_etaghandler", HTTP_SENDBUF_SIZE, 1 TSRMLS_CC))) {
-               return SUCCESS;
-       } else {
-               return FAILURE;
+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);
+               return 1;
        }
+       return 0;
 }
-/* }}} */
 
 /* {{{ void http_ob_etaghandler(char *, uint, char **, uint *, int) */
-PHP_HTTP_API void _http_ob_etaghandler(char *output, uint output_len,
+void _http_ob_etaghandler(char *output, uint output_len,
        char **handled_output, uint *handled_output_len, int mode TSRMLS_DC)
 {
-       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);
 }
 /* }}} */