X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_response_object.c;h=28d662ae6cc9d925a2bfb4179d9ff66ac3c5d7ac;hp=bb2f0cebbe011ab4ebaaecb055d78393903d668e;hb=0d84055a1b044e267dc52ace7b7ecfd3ede4fd3c;hpb=89572c25844ea2a641a6bef11b2cd1e1be699282 diff --git a/http_response_object.c b/http_response_object.c index bb2f0ce..28d662a 100644 --- a/http_response_object.c +++ b/http_response_object.c @@ -38,7 +38,11 @@ ZEND_EXTERN_MODULE_GLOBALS(http); -#define GET_STATIC_PROP(n) *GET_STATIC_PROP_EX(http_response_object_ce, n) +#define USE_STATIC_PROP() USE_STATIC_PROP_EX(http_response_object_ce) +#define GET_STATIC_PROP(n) *GET_STATIC_PROP_EX(http_response_object_ce, n) +#define SET_STATIC_PROP(n, v) SET_STATIC_PROP_EX(http_response_object_ce, n, v) +#define SET_STATIC_PROP_STRING(n, s, d) SET_STATIC_PROP_STRING_EX(http_response_object_ce, n, s, d) +#define SET_STATIC_PROP_STRINGL(n, s, l, d) SET_STATIC_PROP_STRINGL_EX(http_response_object_ce, n, s, l, d) #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) @@ -160,21 +164,23 @@ static inline void _http_response_object_declare_default_properties(TSRMLS_D) { zend_class_entry *ce = http_response_object_ce; - DCL_STATIC_PROP(PRIVATE, long, sent, 0); + 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, catch, 0); - DCL_STATIC_PROP(PROTECTED, long, cache, 0); - DCL_STATIC_PROP(PROTECTED, long, gzip, 0); + DCL_STATIC_PROP(PROTECTED, bool, cache, 0); + DCL_STATIC_PROP(PROTECTED, bool, gzip, 0); DCL_STATIC_PROP(PROTECTED, long, stream, 0); - DCL_STATIC_PROP(PROTECTED, string, file, ""); - DCL_STATIC_PROP(PROTECTED, string, data, ""); - DCL_STATIC_PROP(PROTECTED, string, eTag, ""); + 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(PROTECTED, string, cacheControl, HTTP_DEFAULT_CACHECONTROL); - DCL_STATIC_PROP(PROTECTED, string, contentType, INI_STR("default_content_type")); - DCL_STATIC_PROP(PROTECTED, string, contentDisposition, ""); + DCL_STATIC_PROP_N(PROTECTED, cacheControl); + DCL_STATIC_PROP_N(PROTECTED, contentType); + 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(PUBLIC, string, dummy, "EMPTY"); } /* ### USERLAND ### */ @@ -197,7 +203,7 @@ PHP_METHOD(HttpResponse, setCache) RETURN_FALSE; } - ZVAL_LONG(GET_STATIC_PROP(cache), do_cache); + ZVAL_BOOL(GET_STATIC_PROP(cache), do_cache); RETURN_TRUE; } /* }}} */ @@ -228,7 +234,7 @@ PHP_METHOD(HttpResponse, setGzip) RETURN_FALSE; } - ZVAL_LONG(GET_STATIC_PROP(gzip), do_gzip); + ZVAL_BOOL(GET_STATIC_PROP(gzip), do_gzip); RETURN_TRUE; } /* }}} */ @@ -249,7 +255,7 @@ PHP_METHOD(HttpResponse, getGzip) /* {{{ proto bool HttpResponse::setCacheControl(string control[, long max_age = 0]) * - * Set a custom cache-control header, usually being "private" or "public"; + * Set a custom cache-control header, usually being "private" or "public"; * The max_age parameter controls how long the cache entry is valid on the client side. */ PHP_METHOD(HttpResponse, setCacheControl) @@ -268,8 +274,9 @@ PHP_METHOD(HttpResponse, setCacheControl) http_error_ex(E_WARNING, HTTP_E_PARAM, "Cache-Control '%s' doesn't match public, private or no-cache", ccontrol); RETURN_FALSE; } else { + USE_STATIC_PROP(); spprintf(&cctl, 0, HTTP_CACHECONTROL_TEMPLATE, ccontrol, max_age); - ZVAL_STRING_FREE(GET_STATIC_PROP(cacheControl), cctl, 0); + SET_STATIC_PROP_STRING(cacheControl, cctl, 0); RETURN_TRUE; } } @@ -308,7 +315,8 @@ PHP_METHOD(HttpResponse, setContentType) RETURN_FALSE; } - ZVAL_STRINGL_FREE(GET_STATIC_PROP(contentType), ctype, ctype_len, 1); + USE_STATIC_PROP(); + SET_STATIC_PROP_STRINGL(contentType, ctype, ctype_len, 1); RETURN_TRUE; } /* }}} */ @@ -347,7 +355,7 @@ PHP_METHOD(HttpResponse, setContentDisposition) } spprintf(&cd, 0, HTTP_CONTENTDISPOSITION_TEMPLATE, send_inline ? "inline" : "attachment", file); - ZVAL_STRING_FREE(GET_STATIC_PROP(contentDisposition), cd, 0); + SET_STATIC_PROP_STRING(contentDisposition, cd, 0); RETURN_TRUE; } /* }}} */ @@ -380,7 +388,8 @@ PHP_METHOD(HttpResponse, setETag) RETURN_FALSE; } - ZVAL_STRINGL_FREE(GET_STATIC_PROP(eTag), etag, etag_len, 1); + USE_STATIC_PROP(); + SET_STATIC_PROP_STRINGL(eTag, etag, etag_len, 1); RETURN_TRUE; } /* }}} */ @@ -458,17 +467,21 @@ PHP_METHOD(HttpResponse, getBufferSize) */ PHP_METHOD(HttpResponse, setData) { - zval *the_data, *data; + zval *the_data, **data; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &the_data)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &the_data)) { RETURN_FALSE; } - convert_to_string_ex(&the_data); - data = GET_STATIC_PROP(data); - ZVAL_STRINGL_FREE(data, Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), 1); + + USE_STATIC_PROP(); + SET_STATIC_PROP(data, the_data); ZVAL_LONG(GET_STATIC_PROP(lastModified), http_last_modified(the_data, SEND_DATA)); ZVAL_LONG(GET_STATIC_PROP(mode), SEND_DATA); + if (!Z_STRLEN_P(GET_STATIC_PROP(eTag))) { + SET_STATIC_PROP_STRING(eTag, http_etag(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), SEND_DATA), 0); + } + RETURN_TRUE; } /* }}} */ @@ -500,11 +513,17 @@ PHP_METHOD(HttpResponse, setStream) if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &the_stream)) { RETURN_FALSE; } - + zend_list_addref(Z_LVAL_P(the_stream)); php_stream_from_zval(the_real_stream, &the_stream); + + USE_STATIC_PROP(); ZVAL_LONG(GET_STATIC_PROP(stream), Z_LVAL_P(the_stream)); ZVAL_LONG(GET_STATIC_PROP(lastModified), http_last_modified(the_real_stream, SEND_RSRC)); ZVAL_LONG(GET_STATIC_PROP(mode), SEND_RSRC); + if (!Z_STRLEN_P(GET_STATIC_PROP(eTag))) { + SET_STATIC_PROP_STRING(eTag, http_etag(the_real_stream, 0, SEND_RSRC), 0); + } + RETURN_TRUE; } /* }}} */ @@ -531,14 +550,18 @@ PHP_METHOD(HttpResponse, setFile) { zval *the_file; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &the_file)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &the_file)) { RETURN_FALSE; } convert_to_string_ex(&the_file); - ZVAL_STRINGL_FREE(GET_STATIC_PROP(file), Z_STRVAL_P(the_file), Z_STRLEN_P(the_file), 1); + USE_STATIC_PROP(); + SET_STATIC_PROP(file, the_file); ZVAL_LONG(GET_STATIC_PROP(lastModified), http_last_modified(the_file, -1)); ZVAL_LONG(GET_STATIC_PROP(mode), -1); + if (!Z_STRLEN_P(GET_STATIC_PROP(eTag))) { + SET_STATIC_PROP_STRING(eTag, http_etag(the_file, 0, -1), 0); + } RETURN_TRUE; } @@ -562,6 +585,17 @@ PHP_METHOD(HttpResponse, getFile) /* {{{ proto bool HttpResponse::send([bool clean_ob = true]) * * Finally send the entity. + * + * Example: + * 
+ * 
+ *
*/ PHP_METHOD(HttpResponse, send) { @@ -571,17 +605,23 @@ PHP_METHOD(HttpResponse, send) if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &clean_ob)) { RETURN_FALSE; } + if (SG(headers_sent)) { + http_error(E_WARNING, HTTP_E_HEADER, "Cannot send HttpResponse, headers have already been sent"); + RETURN_FALSE; + } if (clean_ob) { /* interrupt on-the-fly etag generation */ HTTP_G(etag).started = 0; /* discard previous output buffers */ - //php_end_ob_buffers(0 TSRMLS_CC); + php_end_ob_buffers(0 TSRMLS_CC); } /* gzip */ if (Z_LVAL_P(GET_STATIC_PROP(gzip))) { - php_start_ob_buffer_named("ob_gzhandler", 0, 1 TSRMLS_CC); + php_start_ob_buffer_named("ob_gzhandler", 0, 0 TSRMLS_CC); + } else { + php_start_ob_buffer(NULL, 0, 0 TSRMLS_CC); } /* caching */ @@ -594,7 +634,7 @@ PHP_METHOD(HttpResponse, send) lmod = GET_STATIC_PROP(lastModified); cctl = 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_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)); } @@ -604,7 +644,14 @@ PHP_METHOD(HttpResponse, send) if (Z_STRLEN_P(ctype)) { http_send_content_type(Z_STRVAL_P(ctype), Z_STRLEN_P(ctype)); } else { - http_send_content_type("application/x-octetstream", lenof("application/x-octetstream")); + char *ctypes = INI_STR("default_mimetype"); + size_t ctlen = ctypes ? strlen(ctypes) : 0; + + if (ctlen) { + http_send_content_type(ctypes, ctlen); + } else { + http_send_content_type("application/x-octetstream", lenof("application/x-octetstream")); + } } } @@ -613,7 +660,7 @@ PHP_METHOD(HttpResponse, send) zval *cd = GET_STATIC_PROP(contentDisposition); if (Z_STRLEN_P(cd)) { char *cds; - + spprintf(&cds, 0, "Content-Disposition: %s", Z_STRVAL_P(cd)); http_send_header(cds); efree(cds); @@ -640,6 +687,7 @@ PHP_METHOD(HttpResponse, send) { php_stream *the_real_stream; zval *the_stream = GET_STATIC_PROP(stream); + the_stream->type = IS_RESOURCE; php_stream_from_zval(the_real_stream, &the_stream); RETURN_SUCCESS(http_send_stream(the_real_stream)); }