- http_ob_etaghandler() belongs to the cache_api now

diff --git a/php_http_api.h b/php_http_api.h
index b6572225abb03c1a9bd27d24dbb14468ddfff3d7..105f3d1673c065a93c4facb1e54921dfea535eef 100644 (file)
--- a/php_http_api.h
+++ b/php_http_api.h
@@ -37,9 +37,6 @@ extern void _http_error_ex(long type, long code, const char *format, ...);
 #define http_get_server_var_ex(v, s) _http_get_server_var_ex((v), (s), 0 TSRMLS_CC)
 PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_size, zend_bool check TSRMLS_DC);
 
-#define http_ob_etaghandler(o, l, ho, hl, m) _http_ob_etaghandler((o), (l), (ho), (hl), (m) TSRMLS_CC)
-PHP_HTTP_API void _http_ob_etaghandler(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC);
-
 #define http_chunked_decode(e, el, d, dl) _http_chunked_decode((e), (el), (d), (dl) TSRMLS_CC)
 PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len TSRMLS_DC);
 

diff --git a/php_http_cache_api.h b/php_http_cache_api.h
index 30074cd2170e8e6834d296707b9162e8ec071bcf..0a93f681f01efaea587e41f77a110d33ed9d4faa 100644 (file)
--- a/php_http_cache_api.h
+++ b/php_http_cache_api.h
@@ -44,6 +44,9 @@ PHP_HTTP_API STATUS _http_cache_etag(const char *etag, size_t etag_len, const ch
 #define http_cache_exit() _http_cache_exit(TSRMLS_C)
 PHP_HTTP_API STATUS _http_cache_exit(TSRMLS_D);
 
+#define http_ob_etaghandler(o, l, ho, hl, m) _http_ob_etaghandler((o), (l), (ho), (hl), (m) TSRMLS_CC)
+PHP_HTTP_API void _http_ob_etaghandler(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC);
+
 #endif
 
 /*