X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_response_object.c;h=f2c5e5730d13a262b5967385f5dc937b259640c1;hp=84e979c7610992381283cf730836765a6d2dace6;hb=ff17beb99d61462cf1791eecdb3f68dbd2aea5e5;hpb=d83edb65a0097de2d5baa1a9fd9dbcebed34cc79 diff --git a/http_response_object.c b/http_response_object.c index 84e979c..f2c5e57 100644 --- a/http_response_object.c +++ b/http_response_object.c @@ -36,12 +36,18 @@ #include "php_http_exception_object.h" #include "php_http_send_api.h" #include "php_http_cache_api.h" +#include "php_http_headers_api.h" + +#ifdef HTTP_HAVE_MHASH +# include +#endif ZEND_EXTERN_MODULE_GLOBALS(http); #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) #define SET_STATIC_PROP(n, v) SET_STATIC_PROP_EX(http_response_object_ce, n, v) +#define UPD_STATIC_STRL(n, v, l) UPD_STATIC_STRL_EX(http_response_object_ce, n, v, l) #define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpResponse, method, 0, req_args) #define HTTP_EMPTY_ARGS(method, ret_ref) HTTP_EMPTY_ARGS_EX(HttpResponse, method, ret_ref) @@ -147,6 +153,8 @@ HTTP_EMPTY_ARGS(getRequestBody, 0); #define http_response_object_declare_default_properties() _http_response_object_declare_default_properties(TSRMLS_C) static inline void _http_response_object_declare_default_properties(TSRMLS_D); +#define http_grab_response_headers _http_grab_response_headers +static void _http_grab_response_headers(void *data, void *arg TSRMLS_DC); zend_class_entry *http_response_object_ce; zend_function_entry http_response_object_fe[] = { @@ -216,11 +224,11 @@ static inline void _http_response_object_declare_default_properties(TSRMLS_D) DCL_STATIC_PROP(PRIVATE, bool, sent, 0); DCL_STATIC_PROP(PRIVATE, bool, catch, 0); DCL_STATIC_PROP(PRIVATE, long, mode, -1); + DCL_STATIC_PROP(PRIVATE, long, stream, 0); + DCL_STATIC_PROP_N(PRIVATE, file); + DCL_STATIC_PROP_N(PRIVATE, data); DCL_STATIC_PROP(PROTECTED, bool, cache, 0); DCL_STATIC_PROP(PROTECTED, bool, gzip, 0); - DCL_STATIC_PROP(PROTECTED, long, stream, 0); - DCL_STATIC_PROP_N(PROTECTED, file); - DCL_STATIC_PROP_N(PROTECTED, data); DCL_STATIC_PROP_N(PROTECTED, eTag); DCL_STATIC_PROP(PROTECTED, long, lastModified, 0); DCL_STATIC_PROP_N(PROTECTED, cacheControl); @@ -228,7 +236,31 @@ static inline void _http_response_object_declare_default_properties(TSRMLS_D) DCL_STATIC_PROP_N(PROTECTED, contentDisposition); DCL_STATIC_PROP(PROTECTED, long, bufferSize, HTTP_SENDBUF_SIZE); DCL_STATIC_PROP(PROTECTED, double, throttleDelay, 0.0); - DCL_STATIC_PROP_N(PROTECTED, headers); + + DCL_CONST(long, "ETAG_MD5", HTTP_ETAG_MD5); + DCL_CONST(long, "ETAG_SHA1", HTTP_ETAG_SHA1); + +#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 +} + +static void _http_grab_response_headers(void *data, void *arg TSRMLS_DC) +{ + phpstr_appendl(PHPSTR(arg), ((sapi_header_struct *)data)->header); + phpstr_appends(PHPSTR(arg), HTTP_CRLF); } /* ### USERLAND ### */ @@ -240,38 +272,41 @@ PHP_METHOD(HttpResponse, setHeader) zend_bool replace = 1; char *name; int name_len = 0; - zval *value = NULL, *headers, **header; + zval *value = NULL; if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz/!|b", &name, &name_len, &value, &replace)) { RETURN_FALSE; } + if (SG(headers_sent)) { + http_error(HE_WARNING, HTTP_E_HEADER, "Cannot add another header when headers have already been sent"); + RETURN_FALSE; + } if (!name_len) { http_error(HE_WARNING, HTTP_E_HEADER, "Cannot send anonymous headers"); RETURN_FALSE; } - headers = GET_STATIC_PROP(headers); - - if (Z_TYPE_P(headers) != IS_ARRAY) { - convert_to_array(headers); - } - /* delete header if value == null */ if (!value || Z_TYPE_P(value) == IS_NULL) { - RETURN_SUCCESS(zend_hash_del(Z_ARRVAL_P(headers), name, name_len + 1)); + RETURN_SUCCESS(http_send_header_ex(name, name_len, "", 0, replace, NULL)); } - + /* send multiple header if replace is false and value is an array */ + if (!replace && Z_TYPE_P(value) == IS_ARRAY) { + zval **data; + + FOREACH_VAL(value, data) { + convert_to_string_ex(data); + if (SUCCESS != http_send_header_ex(name, name_len, Z_STRVAL_PP(data), Z_STRLEN_PP(data), 0, NULL)) { + RETURN_FALSE; + } + } + RETURN_TRUE; + } + /* send standard header */ if (Z_TYPE_P(value) != IS_STRING) { convert_to_string_ex(&value); } - - /* convert old header to an array and add new one if header exists and replace == false */ - if (replace || (SUCCESS != zend_hash_find(Z_ARRVAL_P(headers), name, name_len + 1, (void **) &header))) { - RETURN_SUCCESS(add_assoc_stringl_ex(headers, name, name_len + 1, Z_STRVAL_P(value), Z_STRLEN_P(value), 1)); - } else { - convert_to_array(*header); - RETURN_SUCCESS(add_next_index_stringl(*header, Z_STRVAL_P(value), Z_STRLEN_P(value), 1)); - } + RETURN_SUCCESS(http_send_header_ex(name, name_len, Z_STRVAL_P(value), Z_STRLEN_P(value), replace, NULL)); } /* }}} */ @@ -281,25 +316,34 @@ PHP_METHOD(HttpResponse, getHeader) { char *name = NULL; int name_len = 0; - zval *headers, **header; + phpstr headers; if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &name, &name_len)) { RETURN_FALSE; } - headers = GET_STATIC_PROP(headers); - if (Z_TYPE_P(headers) != IS_ARRAY) { - convert_to_array(headers); - } + phpstr_init(&headers); + zend_llist_apply_with_argument(&SG(sapi_headers).headers, http_grab_response_headers, &headers TSRMLS_CC); + phpstr_fix(&headers); - if (!name || !name_len) { - array_init(return_value); - array_copy(headers, return_value); - } else if (SUCCESS == zend_hash_find(Z_ARRVAL_P(headers), name, name_len + 1, (void **) &header)) { - RETURN_ZVAL(*header, 1, 0); + if (name && name_len) { + zval **header; + HashTable headers_ht; + + zend_hash_init(&headers_ht, sizeof(zval *), NULL, ZVAL_PTR_DTOR, 0); + if ( (SUCCESS == http_parse_headers_ex(PHPSTR_VAL(&headers), &headers_ht, 1)) && + (SUCCESS == zend_hash_find(&headers_ht, name, name_len + 1, (void **) &header))) { + RETVAL_ZVAL(*header, 1, 0); + } else { + RETVAL_NULL(); + } + zend_hash_destroy(&headers_ht); } else { - RETURN_NULL(); + array_init(return_value); + http_parse_headers_ex(PHPSTR_VAL(&headers), Z_ARRVAL_P(return_value), 1); } + + phpstr_dtor(&headers); } /* }}} */ @@ -334,7 +378,9 @@ PHP_METHOD(HttpResponse, getCache) NO_ARGS; IF_RETVAL_USED { - RETURN_BOOL(Z_LVAL_P(GET_STATIC_PROP(cache))); + zval *cache = convert_to_type_ex(IS_BOOL, GET_STATIC_PROP(cache)); + + RETURN_ZVAL(cache, 1, 0); } } /* }}}*/ @@ -364,7 +410,9 @@ PHP_METHOD(HttpResponse, getGzip) NO_ARGS; IF_RETVAL_USED { - RETURN_BOOL(Z_LVAL_P(GET_STATIC_PROP(gzip))); + zval *gzip = convert_to_type_ex(IS_BOOL, GET_STATIC_PROP(gzip)); + + RETURN_ZVAL(gzip, 1, 0); } } /* }}} */ @@ -388,8 +436,8 @@ PHP_METHOD(HttpResponse, setCacheControl) http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Cache-Control '%s' doesn't match public, private or no-cache", ccontrol); RETURN_FALSE; } else { - spprintf(&cctl, 0, "%s, must-revalidate, max_age=%ld", ccontrol, max_age); - RETVAL_SUCCESS(UPD_STATIC_PROP(string, cacheControl, cctl)); + size_t cctl_len = spprintf(&cctl, 0, "%s, must-revalidate, max_age=%ld", ccontrol, max_age); + RETVAL_SUCCESS(UPD_STATIC_STRL(cacheControl, cctl, cctl_len)); efree(cctl); } } @@ -404,8 +452,9 @@ PHP_METHOD(HttpResponse, getCacheControl) NO_ARGS; IF_RETVAL_USED { - zval *ccontrol = GET_STATIC_PROP(cacheControl); - RETURN_STRINGL(Z_STRVAL_P(ccontrol), Z_STRLEN_P(ccontrol), 1); + zval *ccontrol = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(cacheControl)); + + RETURN_ZVAL(ccontrol, 1, 0); } } /* }}} */ @@ -428,7 +477,7 @@ PHP_METHOD(HttpResponse, setContentType) RETURN_FALSE; } - RETURN_SUCCESS(UPD_STATIC_PROP(string, contentType, ctype)); + RETURN_SUCCESS(UPD_STATIC_STRL(contentType, ctype, ctype_len)); } /* }}} */ @@ -441,8 +490,9 @@ PHP_METHOD(HttpResponse, getContentType) NO_ARGS; IF_RETVAL_USED { - zval *ctype = GET_STATIC_PROP(contentType); - RETURN_STRINGL(Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1); + zval *ctype = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(contentType)); + + RETURN_ZVAL(ctype, 1, 0); } } /* }}} */ @@ -450,7 +500,6 @@ PHP_METHOD(HttpResponse, getContentType) /* {{{ proto static string HttpResponse::guessContentType(string magic_file[, long magic_mode]) * * Attempts to guess the content type of supplied payload through libmagic. - * See docs/KnownIssues.txt! */ PHP_METHOD(HttpResponse, guessContentType) { @@ -503,14 +552,15 @@ PHP_METHOD(HttpResponse, setContentDisposition) { char *file, *cd; int file_len; + size_t cd_len; zend_bool send_inline = 0; if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &file, &file_len, &send_inline)) { RETURN_FALSE; } - spprintf(&cd, 0, "%s; filename=\"%s\"", send_inline ? "inline" : "attachment", file); - RETVAL_SUCCESS(UPD_STATIC_PROP(string, contentDisposition, cd)); + cd_len = spprintf(&cd, 0, "%s; filename=\"%s\"", send_inline ? "inline" : "attachment", file); + RETVAL_SUCCESS(UPD_STATIC_STRL(contentDisposition, cd, cd_len)); efree(cd); } /* }}} */ @@ -524,8 +574,9 @@ PHP_METHOD(HttpResponse, getContentDisposition) NO_ARGS; IF_RETVAL_USED { - zval *cd = GET_STATIC_PROP(contentDisposition); - RETURN_STRINGL(Z_STRVAL_P(cd), Z_STRLEN_P(cd), 1); + zval *cd = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(contentDisposition)); + + RETURN_ZVAL(cd, 1, 0); } } /* }}} */ @@ -543,7 +594,7 @@ PHP_METHOD(HttpResponse, setETag) RETURN_FALSE; } - RETURN_SUCCESS(UPD_STATIC_PROP(string, eTag, etag)); + RETURN_SUCCESS(UPD_STATIC_STRL(eTag, etag, etag_len)); } /* }}} */ @@ -556,8 +607,9 @@ PHP_METHOD(HttpResponse, getETag) NO_ARGS; IF_RETVAL_USED { - zval *etag = GET_STATIC_PROP(eTag); - RETURN_STRINGL(Z_STRVAL_P(etag), Z_STRLEN_P(etag), 1); + zval *etag = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(eTag)); + + RETURN_ZVAL(etag, 1, 0); } } /* }}} */ @@ -587,7 +639,9 @@ PHP_METHOD(HttpResponse, getLastModified) NO_ARGS; IF_RETVAL_USED { - RETURN_LONG(Z_LVAL_P(GET_STATIC_PROP(lastModified))); + zval *lm = convert_to_type_ex(IS_LONG, GET_STATIC_PROP(lastModified)); + + RETURN_ZVAL(lm, 1, 0); } } /* }}} */ @@ -614,7 +668,9 @@ PHP_METHOD(HttpResponse, getThrottleDelay) NO_ARGS; IF_RETVAL_USED { - RETURN_DOUBLE(Z_DVAL_P(GET_STATIC_PROP(throttleDelay))); + zval *delay = convert_to_type_ex(IS_DOUBLE, GET_STATIC_PROP(throttleDelay)); + + RETURN_ZVAL(delay, 1, 0); } } /* }}} */ @@ -641,7 +697,9 @@ PHP_METHOD(HttpResponse, getBufferSize) NO_ARGS; IF_RETVAL_USED { - RETURN_LONG(Z_LVAL_P(GET_STATIC_PROP(bufferSize))); + zval *size = convert_to_type_ex(IS_LONG, GET_STATIC_PROP(bufferSize)); + + RETURN_ZVAL(size, 1, 0); } } /* }}} */ @@ -666,13 +724,15 @@ PHP_METHOD(HttpResponse, setData) RETURN_FALSE; } - if (!(Z_LVAL_P(GET_STATIC_PROP(lastModified)) > 0)) { + if (!(Z_LVAL_P(convert_to_type_ex(IS_LONG, GET_STATIC_PROP(lastModified))) > 0)) { UPD_STATIC_PROP(long, lastModified, http_last_modified(the_data, SEND_DATA)); } - if (!Z_STRLEN_P(GET_STATIC_PROP(eTag))) { + if (!Z_STRLEN_P(convert_to_type_ex(IS_STRING, GET_STATIC_PROP(eTag)))) { char *etag = http_etag(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), SEND_DATA); - UPD_STATIC_PROP(string, eTag, etag); - efree(etag); + if (etag) { + UPD_STATIC_PROP(string, eTag, etag); + efree(etag); + } } RETURN_TRUE; @@ -689,7 +749,8 @@ PHP_METHOD(HttpResponse, getData) IF_RETVAL_USED { zval *the_data = GET_STATIC_PROP(data); - RETURN_STRINGL(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), 1); + + RETURN_ZVAL(the_data, 1, 0); } } /* }}} */ @@ -719,13 +780,15 @@ PHP_METHOD(HttpResponse, setStream) } zend_list_addref(Z_LVAL_P(the_stream)); - if (!(Z_LVAL_P(GET_STATIC_PROP(lastModified)) > 0)) { + if (!(Z_LVAL_P(convert_to_type_ex(IS_LONG, GET_STATIC_PROP(lastModified))) > 0)) { UPD_STATIC_PROP(long, lastModified, http_last_modified(the_real_stream, SEND_RSRC)); } - if (!Z_STRLEN_P(GET_STATIC_PROP(eTag))) { + if (!Z_STRLEN_P(convert_to_type_ex(IS_STRING, GET_STATIC_PROP(eTag)))) { char *etag = http_etag(the_real_stream, 0, SEND_RSRC); - UPD_STATIC_PROP(string, eTag, etag); - efree(etag); + if (etag) { + UPD_STATIC_PROP(string, eTag, etag); + efree(etag); + } } RETURN_TRUE; @@ -741,7 +804,7 @@ PHP_METHOD(HttpResponse, getStream) NO_ARGS; IF_RETVAL_USED { - RETURN_RESOURCE(Z_LVAL_P(GET_STATIC_PROP(stream))); + RETURN_RESOURCE(Z_LVAL_P(convert_to_type_ex(IS_LONG, GET_STATIC_PROP(stream)))); } } /* }}} */ @@ -764,18 +827,20 @@ PHP_METHOD(HttpResponse, setFile) RETURN_FALSE; } - if ( (SUCCESS != UPD_STATIC_PROP(string, file, the_file)) || + if ( (SUCCESS != UPD_STATIC_STRL(file, the_file, file_len)) || (SUCCESS != UPD_STATIC_PROP(long, mode, -1))) { RETURN_FALSE; } - if (!(Z_LVAL_P(GET_STATIC_PROP(lastModified)))) { + if (!(Z_LVAL_P(convert_to_type_ex(IS_LONG, GET_STATIC_PROP(lastModified))) > 0)) { UPD_STATIC_PROP(long, lastModified, http_last_modified(the_file, -1)); } - if (!Z_STRLEN_P(GET_STATIC_PROP(eTag))) { + if (!Z_STRLEN_P(convert_to_type_ex(IS_STRING, GET_STATIC_PROP(eTag)))) { char *etag = http_etag(the_file, 0, -1); - UPD_STATIC_PROP(string, eTag, etag); - efree(etag); + if (etag) { + UPD_STATIC_PROP(string, eTag, etag); + efree(etag); + } } RETURN_TRUE; @@ -791,8 +856,9 @@ PHP_METHOD(HttpResponse, getFile) NO_ARGS; IF_RETVAL_USED { - zval *the_file = GET_STATIC_PROP(file); - RETURN_STRINGL(Z_STRVAL_P(the_file), Z_STRLEN_P(the_file), 1); + zval *the_file = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(file)); + + RETURN_ZVAL(the_file, 1, 0); } } /* }}} */ @@ -826,7 +892,7 @@ PHP_METHOD(HttpResponse, send) } sent = GET_STATIC_PROP(sent); - if (Z_LVAL_P(sent)) { + if (zval_is_true(sent)) { http_error(HE_WARNING, HTTP_E_RESPONSE, "Cannot send HttpResponse, response has already been sent"); RETURN_FALSE; } else { @@ -834,7 +900,7 @@ PHP_METHOD(HttpResponse, send) } /* capture mode */ - if (Z_BVAL_P(GET_STATIC_PROP(catch))) { + if (zval_is_true(GET_STATIC_PROP(catch))) { zval *the_data; MAKE_STD_ZVAL(the_data); @@ -842,10 +908,12 @@ PHP_METHOD(HttpResponse, send) SET_STATIC_PROP(data, the_data); ZVAL_LONG(GET_STATIC_PROP(mode), SEND_DATA); - if (!Z_STRLEN_P(GET_STATIC_PROP(eTag))) { + if (!Z_STRLEN_P(convert_to_type_ex(IS_STRING, GET_STATIC_PROP(eTag)))) { char *etag = http_etag(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), SEND_DATA); - UPD_STATIC_PROP(string, eTag, etag); - efree(etag); + if (etag) { + UPD_STATIC_PROP(string, eTag, etag); + efree(etag); + } } zval_ptr_dtor(&the_data); @@ -859,45 +927,20 @@ PHP_METHOD(HttpResponse, send) php_end_ob_buffers(0 TSRMLS_CC); } - /* custom headers */ - headers = GET_STATIC_PROP(headers); - if (Z_TYPE_P(headers) == IS_ARRAY) { - char *name = NULL; - ulong idx = 0; - zval **value; - - FOREACH_KEYVAL(headers, name, idx, value) { - if (name) { - if (Z_TYPE_PP(value) == IS_ARRAY) { - zend_bool first = 1; - zval **data; - - FOREACH_VAL(*value, data) { - http_send_header_ex(name, strlen(name), Z_STRVAL_PP(data), Z_STRLEN_PP(data), first, NULL); - first = 0; - } - } else { - http_send_header_ex(name, strlen(name), Z_STRVAL_PP(value), Z_STRLEN_PP(value), 1, NULL); - } - name = NULL; - } - } - } - /* gzip */ - if (Z_LVAL_P(GET_STATIC_PROP(gzip))) { + if (zval_is_true(GET_STATIC_PROP(gzip))) { php_start_ob_buffer_named("ob_gzhandler", 0, 0 TSRMLS_CC); } else { php_start_ob_buffer(NULL, 0, 0 TSRMLS_CC); } /* caching */ - if (Z_LVAL_P(GET_STATIC_PROP(cache))) { + if (zval_is_true(GET_STATIC_PROP(cache))) { zval *cctl, *etag, *lmod; - etag = GET_STATIC_PROP(eTag); - lmod = GET_STATIC_PROP(lastModified); - cctl = GET_STATIC_PROP(cacheControl); + etag = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(eTag)); + lmod = convert_to_type_ex(IS_LONG, GET_STATIC_PROP(lastModified)); + cctl = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(cacheControl)); http_cache_etag(Z_STRVAL_P(etag), Z_STRLEN_P(etag), Z_STRVAL_P(cctl), Z_STRLEN_P(cctl)); http_cache_last_modified(Z_LVAL_P(lmod), Z_LVAL_P(lmod) ? Z_LVAL_P(lmod) : time(NULL), Z_STRVAL_P(cctl), Z_STRLEN_P(cctl)); @@ -905,7 +948,7 @@ PHP_METHOD(HttpResponse, send) /* content type */ { - zval *ctype = GET_STATIC_PROP(contentType); + zval *ctype = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(contentType)); if (Z_STRLEN_P(ctype)) { http_send_content_type(Z_STRVAL_P(ctype), Z_STRLEN_P(ctype)); } else { @@ -930,8 +973,8 @@ PHP_METHOD(HttpResponse, send) /* throttling */ { - HTTP_G(send).buffer_size = Z_LVAL_P(GET_STATIC_PROP(bufferSize)); - HTTP_G(send).throttle_delay = Z_DVAL_P(GET_STATIC_PROP(throttleDelay)); + HTTP_G(send).buffer_size = Z_LVAL_P(convert_to_type_ex(IS_LONG, GET_STATIC_PROP(bufferSize))); + HTTP_G(send).throttle_delay = Z_DVAL_P(convert_to_type_ex(IS_DOUBLE, GET_STATIC_PROP(throttleDelay))); } /* send */ @@ -940,14 +983,14 @@ PHP_METHOD(HttpResponse, send) { case SEND_DATA: { - zval *zdata = GET_STATIC_PROP(data); + zval *zdata = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(data)); RETURN_SUCCESS(http_send_data_ex(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata), 1)); } case SEND_RSRC: { php_stream *the_real_stream; - zval *the_stream = GET_STATIC_PROP(stream); + zval *the_stream = convert_to_type_ex(IS_LONG, GET_STATIC_PROP(stream)); the_stream->type = IS_RESOURCE; php_stream_from_zval(the_real_stream, &the_stream); RETURN_SUCCESS(http_send_stream_ex(the_real_stream, 0, 1)); @@ -955,7 +998,7 @@ PHP_METHOD(HttpResponse, send) default: { - RETURN_SUCCESS(http_send_file_ex(Z_STRVAL_P(GET_STATIC_PROP(file)), 1)); + RETURN_SUCCESS(http_send_file_ex(Z_STRVAL_P(convert_to_type_ex(IS_STRING, GET_STATIC_PROP(file))), 1)); } } } @@ -989,9 +1032,7 @@ PHP_METHOD(HttpResponse, capture) php_end_ob_buffers(0 TSRMLS_CC); php_start_ob_buffer(NULL, 0, 0 TSRMLS_CC); -#ifndef WONKY - /* register shutdown function -- - messing around with ob and headers only works in PHP-5.1 or greater */ + /* register shutdown function */ { zval func, retval, arg, *argp[1]; @@ -1007,7 +1048,6 @@ PHP_METHOD(HttpResponse, capture) call_user_function(EG(function_table), NULL, &func, &retval, 1, argp TSRMLS_CC); zval_dtor(&arg); } -#endif } /* }}} */