#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include "php.h"
-#include "missing.h"
+#define HTTP_WANT_MAGIC
+#include "php_http.h"
/* broken static properties in PHP 5.0 */
#if defined(ZEND_ENGINE_2) && !defined(WONKY)
#include "SAPI.h"
#include "php_ini.h"
-#include "php_http.h"
#include "php_http_api.h"
-#include "php_http_std_defs.h"
-#include "php_http_response_object.h"
-#include "php_http_exception_object.h"
-#include "php_http_send_api.h"
#include "php_http_cache_api.h"
+#include "php_http_exception_object.h"
#include "php_http_headers_api.h"
-
-#ifdef HTTP_HAVE_MHASH
-# include <mhash.h>
-#endif
-#ifdef HTTP_HAVE_MAGIC
-# include <magic.h>
-#endif
-
-ZEND_EXTERN_MODULE_GLOBALS(http);
+#include "php_http_response_object.h"
+#include "php_http_send_api.h"
#define GET_STATIC_PROP(n) *GET_STATIC_PROP_EX(http_response_object_ce, n)
#define UPD_STATIC_PROP(t, n, v) UPD_STATIC_PROP_EX(http_response_object_ce, t, n, v)
DCL_CONST(long, "REDIRECT_PERM", HTTP_REDIRECT_PERM);
DCL_CONST(long, "REDIRECT_POST", HTTP_REDIRECT_POST);
DCL_CONST(long, "REDIRECT_TEMP", HTTP_REDIRECT_TEMP);
-
- DCL_CONST(long, "ETAG_MD5", HTTP_ETAG_MD5);
- DCL_CONST(long, "ETAG_SHA1", HTTP_ETAG_SHA1);
- DCL_CONST(long, "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, "ETAG_MHASH_%s", hash_name);
- zend_declare_class_constant_long(ce, const_name, l, i TSRMLS_CC);
- }
- }
- }
-# endif /* HTTP_HAVE_MHASH */
#endif /* WONKY */
}
}
UPD_STATIC_PROP(long, lastModified, http_last_modified(the_data, SEND_DATA));
- if (etag = http_etag(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), SEND_DATA)) {
+ if ((etag = http_etag(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), SEND_DATA))) {
UPD_STATIC_PROP(string, eTag, etag);
efree(etag);
}
zend_list_addref(Z_LVAL_P(the_stream));
UPD_STATIC_PROP(long, lastModified, http_last_modified(the_real_stream, SEND_RSRC));
- if (etag = http_etag(the_real_stream, 0, SEND_RSRC)) {
+ if ((etag = http_etag(the_real_stream, 0, SEND_RSRC))) {
UPD_STATIC_PROP(string, eTag, etag);
efree(etag);
}
}
UPD_STATIC_PROP(long, lastModified, http_last_modified(the_file, -1));
- if (etag = http_etag(the_file, 0, -1)) {
+ if ((etag = http_etag(the_file, 0, -1))) {
UPD_STATIC_PROP(string, eTag, etag);
efree(etag);
}
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &clean_ob)) {
RETURN_FALSE;
}
- if (SG(headers_sent)) {
- http_error(HE_WARNING, HTTP_E_RESPONSE, "Cannot send HttpResponse, headers have already been sent");
- RETURN_FALSE;
- }
+
+ HTTP_CHECK_HEADERS_SENT(RETURN_FALSE);
sent = GET_STATIC_PROP(sent);
- if (zval_is_true(sent)) {
+ if (Z_LVAL_P(sent)) {
http_error(HE_WARNING, HTTP_E_RESPONSE, "Cannot send HttpResponse, response has already been sent");
RETURN_FALSE;
} else {
if (etag_p) zval_ptr_dtor(&etag_p);
if (lmod_p) zval_ptr_dtor(&lmod_p);
if (cctl_p) zval_ptr_dtor(&cctl_p);
+
+ if (php_ob_handler_used("blackhole" TSRMLS_CC)) {
+ RETURN_TRUE;
+ }
}
/* content type */
}
/* gzip */
- HTTP_G(send).gzip_encoding = zval_is_true(GET_STATIC_PROP(gzip));
+ HTTP_G(send).deflate.encoding = zval_is_true(GET_STATIC_PROP(gzip));
/* start ob */
php_start_ob_buffer(NULL, HTTP_G(send).buffer_size, 0 TSRMLS_CC);
PHP_METHOD(HttpResponse, capture)
{
NO_ARGS;
+
+ HTTP_CHECK_HEADERS_SENT(RETURN_FALSE);
UPD_STATIC_PROP(long, catch, 1);