X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_response_object.c;h=cfa509566fcd7141c166b2500f517f50d2c104e2;hp=52a1dd1cc1efc4b7f62ee5ed79976103c1c3adc5;hb=ad5f896b03adaa073134a00108a9cdf00720673a;hpb=f554559b173302ed66167d8224023d05c5dabc81 diff --git a/http_response_object.c b/http_response_object.c index 52a1dd1..cfa5095 100644 --- a/http_response_object.c +++ b/http_response_object.c @@ -6,7 +6,7 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2006, Michael Wallner | + | Copyright (c) 2004-2010, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -132,10 +132,7 @@ HTTP_EMPTY_ARGS(getRequestHeaders); HTTP_EMPTY_ARGS(getRequestBody); HTTP_EMPTY_ARGS(getRequestBodyStream); -#define http_grab_response_headers _http_grab_response_headers -static void _http_grab_response_headers(void *data, void *arg TSRMLS_DC); - -#define OBJ_PROP_CE http_response_object_ce +#define THIS_CE http_response_object_ce zend_class_entry *http_response_object_ce; zend_function_entry http_response_object_fe[] = { @@ -196,56 +193,38 @@ PHP_MINIT_FUNCTION(http_response_object) { HTTP_REGISTER_CLASS(HttpResponse, http_response_object, NULL, 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, 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_N(PROTECTED, eTag); - DCL_STATIC_PROP(PROTECTED, long, lastModified, 0); - DCL_STATIC_PROP_N(PROTECTED, cacheControl); - DCL_STATIC_PROP_N(PROTECTED, contentType); - DCL_STATIC_PROP_N(PROTECTED, contentDisposition); - DCL_STATIC_PROP(PROTECTED, long, bufferSize, 0); - DCL_STATIC_PROP(PROTECTED, double, throttleDelay, 0.0); + zend_declare_property_bool(THIS_CE, ZEND_STRS("sent")-1, 0, (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC); + zend_declare_property_bool(THIS_CE, ZEND_STRS("catch")-1, 0, (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC); + zend_declare_property_long(THIS_CE, ZEND_STRS("mode")-1, -1, (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC); + zend_declare_property_long(THIS_CE, ZEND_STRS("stream")-1, 0, (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC); + zend_declare_property_null(THIS_CE, ZEND_STRS("file")-1, (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC); + zend_declare_property_null(THIS_CE, ZEND_STRS("data")-1, (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC); + zend_declare_property_bool(THIS_CE, ZEND_STRS("cache")-1, 0, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); + zend_declare_property_bool(THIS_CE, ZEND_STRS("gzip")-1, 0, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); + zend_declare_property_null(THIS_CE, ZEND_STRS("eTag")-1, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); + zend_declare_property_long(THIS_CE, ZEND_STRS("lastModified")-1, 0, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); + zend_declare_property_null(THIS_CE, ZEND_STRS("cacheControl")-1, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); + zend_declare_property_null(THIS_CE, ZEND_STRS("contentType")-1, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); + zend_declare_property_null(THIS_CE, ZEND_STRS("contentDisposition")-1, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); + zend_declare_property_long(THIS_CE, ZEND_STRS("bufferSize")-1, 0, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); + zend_declare_property_double(THIS_CE, ZEND_STRS("throttleDelay")-1, 0.0, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); #ifndef WONKY - DCL_CONST(long, "REDIRECT", HTTP_REDIRECT); - DCL_CONST(long, "REDIRECT_PERM", HTTP_REDIRECT_PERM); - DCL_CONST(long, "REDIRECT_FOUND", HTTP_REDIRECT_FOUND); - DCL_CONST(long, "REDIRECT_POST", HTTP_REDIRECT_POST); - DCL_CONST(long, "REDIRECT_PROXY", HTTP_REDIRECT_PROXY); - DCL_CONST(long, "REDIRECT_TEMP", HTTP_REDIRECT_TEMP); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("REDIRECT")-1, HTTP_REDIRECT TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("REDIRECT_PERM")-1, HTTP_REDIRECT_PERM TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("REDIRECT_FOUND")-1, HTTP_REDIRECT_FOUND TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("REDIRECT_POST")-1, HTTP_REDIRECT_POST TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("REDIRECT_PROXY")-1, HTTP_REDIRECT_PROXY TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("REDIRECT_TEMP")-1, HTTP_REDIRECT_TEMP TSRMLS_CC); #endif /* WONKY */ return SUCCESS; } -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 ### */ /* {{{ proto static bool HttpResponse::setHeader(string name[, mixed value[, bool replace = true]]) - * - * Send an HTTP header. - * - * Expects a string parameter containing the name of the header and a mixed - * parameter containing the value of the header, which will be converted to - * a string. Additionally accepts an optional boolean parameter, which - * specifies whether an existing header should be replaced. If the second - * parameter is unset no header with this name will be sent. - * - * Returns TRUE on success, or FALSE on failure. - * - * Throws HttpHeaderException if http.only_exceptions is TRUE. - */ + Send an HTTP header. */ PHP_METHOD(HttpResponse, setHeader) { zend_bool replace = 1; @@ -270,38 +249,22 @@ PHP_METHOD(HttpResponse, setHeader) /* }}} */ /* {{{ proto static mixed HttpResponse::getHeader([string name]) - * - * Get header(s) about to be sent. - * - * Accepts a string as optional parameter which specifies the name of the - * header to read. If the parameter is empty or omitted, an associative array - * with all headers will be returned. - * - * NOTE: In Apache2 this only works for PHP-5.1.3 and greater. - * - * Returns either a string containing the value of the header matching name, - * FALSE on failure, or an associative array with all headers. - */ + Get header(s) about to be sent. */ PHP_METHOD(HttpResponse, getHeader) { char *name = NULL; int name_len = 0; - phpstr headers; if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &name, &name_len)) { RETURN_FALSE; } - 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) { 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)) && + if ( (SUCCESS == http_get_response_headers(&headers_ht)) && (SUCCESS == zend_hash_find(&headers_ht, name, name_len + 1, (void *) &header))) { RETVAL_ZVAL(*header, 1, 0); } else { @@ -310,27 +273,13 @@ PHP_METHOD(HttpResponse, getHeader) zend_hash_destroy(&headers_ht); } else { array_init(return_value); - http_parse_headers_ex(PHPSTR_VAL(&headers), Z_ARRVAL_P(return_value), 1); + http_get_response_headers(Z_ARRVAL_P(return_value)); } - - phpstr_dtor(&headers); } /* }}} */ /* {{{ proto static bool HttpResponse::setCache(bool cache) - * - * Whether it should be attempted to cache the entity. - * This will result in necessary caching headers and checks of clients - * "If-Modified-Since" and "If-None-Match" headers. If one of those headers - * matches a "304 Not Modified" status code will be issued. - * - * NOTE: If you're using sessions, be sure that you set session.cache_limiter - * to something more appropriate than "no-cache"! - * - * Expects a boolean as parameter specifying whether caching should be attempted. - * - * Returns TRUE on success, or FALSE on failure. - */ + Whether it should be attempted to cache the entity. */ PHP_METHOD(HttpResponse, setCache) { zend_bool do_cache = 0; @@ -339,40 +288,25 @@ PHP_METHOD(HttpResponse, setCache) RETURN_FALSE; } - RETURN_SUCCESS(UPD_STATIC_PROP(bool, cache, do_cache)); + RETURN_SUCCESS(zend_update_static_property_bool(THIS_CE, ZEND_STRS("cache")-1, do_cache TSRMLS_CC)); } /* }}} */ /* {{{ proto static bool HttpResponse::getCache() - * - * Get current caching setting. - * - * Returns TRUE if caching should be attempted, else FALSE. - */ + Get current caching setting. */ PHP_METHOD(HttpResponse, getCache) { NO_ARGS; if (return_value_used) { - zval *cache_p, *cache = convert_to_type_ex(IS_BOOL, GET_STATIC_PROP(cache), &cache_p); - - RETVAL_ZVAL(cache, 1, 0); - - if (cache_p) { - zval_ptr_dtor(&cache_p); - } + zval *cache = http_zsep(IS_BOOL, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("cache")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + RETVAL_ZVAL(cache, 1, 1); } } /* }}}*/ /* {{{ proto static bool HttpResponse::setGzip(bool gzip) - * - * Enable on-thy-fly gzipping of the sent entity. - * - * Expects a boolean as parameter indicating if GZip compression should be enabled. - * - * Returns TRUE on success, or FALSE on failure. - */ + Enable on-thy-fly gzipping of the sent entity. */ PHP_METHOD(HttpResponse, setGzip) { zend_bool do_gzip = 0; @@ -381,47 +315,25 @@ PHP_METHOD(HttpResponse, setGzip) RETURN_FALSE; } - RETURN_SUCCESS(UPD_STATIC_PROP(bool, gzip, do_gzip)); + RETURN_SUCCESS(zend_update_static_property_bool(THIS_CE, ZEND_STRS("gzip")-1, do_gzip TSRMLS_CC)); } /* }}} */ /* {{{ proto static bool HttpResponse::getGzip() - * - * Get current gzipping setting. - * - * Returns TRUE if GZip compression is enabled, else FALSE. - */ + Get current gzipping setting. */ PHP_METHOD(HttpResponse, getGzip) { NO_ARGS; if (return_value_used) { - zval *gzip_p, *gzip = convert_to_type_ex(IS_BOOL, GET_STATIC_PROP(gzip), &gzip_p); - - RETVAL_ZVAL(gzip, 1, 0); - - if (gzip_p) { - zval_ptr_dtor(&gzip_p); - } + zval *gzip = http_zsep(IS_BOOL, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("gzip")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + RETVAL_ZVAL(gzip, 1, 1); } } /* }}} */ /* {{{ proto static bool HttpResponse::setCacheControl(string control[, int max_age = 0[, bool must_revalidate = true]]) - * - * 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. - * - * Expects a string parameter containing the primary cache control setting. - * Additionally accepts an int parameter specifying the max-age setting. - * Accepts an optional third bool parameter indicating whether the cache - * must be revalidated every request. - * - * Returns TRUE on success, or FALSE if control does not match one of - * "public" , "private" or "no-cache". - * - * Throws HttpInvalidParamException if http.only_exceptions is TRUE. - */ + 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) { char *ccontrol, *cctl; @@ -438,45 +350,27 @@ PHP_METHOD(HttpResponse, setCacheControl) RETURN_FALSE; } else { size_t cctl_len = spprintf(&cctl, 0, "%s,%s max-age=%ld", ccontrol, must_revalidate?" must-revalidate,":"", max_age); - RETVAL_SUCCESS(UPD_STATIC_STRL(cacheControl, cctl, cctl_len)); + RETVAL_SUCCESS(zend_update_static_property_stringl(THIS_CE, ZEND_STRS("cacheControl")-1, cctl, cctl_len TSRMLS_CC)); efree(cctl); } } /* }}} */ /* {{{ proto static string HttpResponse::getCacheControl() - * - * Get current Cache-Control header setting. - * - * Returns the current cache control setting as a string like sent in a header. - */ + Get current Cache-Control header setting. */ PHP_METHOD(HttpResponse, getCacheControl) { NO_ARGS; if (return_value_used) { - zval *ccontrol_p, *ccontrol = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(cacheControl), &ccontrol_p); - - RETVAL_ZVAL(ccontrol, 1, 0); - - if (ccontrol_p) { - zval_ptr_dtor(&ccontrol_p); - } + zval *cctl = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("cacheControl")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + RETVAL_ZVAL(cctl, 1, 1); } } /* }}} */ /* {{{ proto static bool HttpResponse::setContentType(string content_type) - * - * Set the content-type of the sent entity. - * - * Expects a string as parameter specifying the content type of the sent entity. - * - * Returns TRUE on success, or FALSE if the content type does not seem to - * contain a primary and secondary content type part. - * - * Throws HttpInvalidParamException if http.only_exceptions is TRUE. - */ + Set the content-type of the sent entity. */ PHP_METHOD(HttpResponse, setContentType) { char *ctype; @@ -487,46 +381,25 @@ PHP_METHOD(HttpResponse, setContentType) } HTTP_CHECK_CONTENT_TYPE(ctype, RETURN_FALSE); - RETURN_SUCCESS(UPD_STATIC_STRL(contentType, ctype, ctype_len)); + RETURN_SUCCESS(zend_update_static_property_stringl(THIS_CE, ZEND_STRS("contentType")-1, ctype, ctype_len TSRMLS_CC)); } /* }}} */ /* {{{ proto static string HttpResponse::getContentType() - * - * Get current Content-Type header setting. - * - * Returns the currently set content type as string. - */ + Get current Content-Type header setting. */ PHP_METHOD(HttpResponse, getContentType) { NO_ARGS; if (return_value_used) { - zval *ctype_p, *ctype = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(contentType), &ctype_p); - - RETVAL_ZVAL(ctype, 1, 0); - - if (ctype_p) { - zval_ptr_dtor(&ctype_p); - } + zval *ctype = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("contentType")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + RETVAL_ZVAL(ctype, 1, 1); } } /* }}} */ /* {{{ proto static string HttpResponse::guessContentType(string magic_file[, int magic_mode = MAGIC_MIME]) - * - * Attempts to guess the content type of supplied payload through libmagic. - * If the attempt is successful, the guessed content type will automatically - * be set as response content type. - * - * Expects a string parameter specifying the magic.mime database to use. - * Additionally accepts an optional int parameter, being flags for libmagic. - * - * Returns the guessed content type on success, or FALSE on failure. - * - * Throws HttpRuntimeException, HttpInvalidParamException - * if http.only_exceptions is TRUE. - */ + Attempts to guess the content type of supplied payload through libmagic. */ PHP_METHOD(HttpResponse, guessContentType) { #ifdef HTTP_HAVE_MAGIC @@ -537,10 +410,10 @@ PHP_METHOD(HttpResponse, guessContentType) RETVAL_FALSE; SET_EH_THROW_HTTP(); if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &magic_file, &magic_file_len, &magic_mode)) { - switch (Z_LVAL_P(GET_STATIC_PROP(mode))) { + switch (Z_LVAL_P(*zend_std_get_static_property(THIS_CE, ZEND_STRS("mode")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))) { case SEND_DATA: { - zval *data = GET_STATIC_PROP(data); + zval *data = *zend_std_get_static_property(THIS_CE, ZEND_STRS("data")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC); ct = http_guess_content_type(magic_file, magic_mode, Z_STRVAL_P(data), Z_STRLEN_P(data), SEND_DATA); break; } @@ -548,7 +421,7 @@ PHP_METHOD(HttpResponse, guessContentType) case SEND_RSRC: { php_stream *s; - zval *z = GET_STATIC_PROP(stream); + zval *z = *zend_std_get_static_property(THIS_CE, ZEND_STRS("stream")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC); z->type = IS_RESOURCE; php_stream_from_zval(s, &z); ct = http_guess_content_type(magic_file, magic_mode, s, 0, SEND_RSRC); @@ -556,11 +429,11 @@ PHP_METHOD(HttpResponse, guessContentType) } default: - ct = http_guess_content_type(magic_file, magic_mode, Z_STRVAL_P(GET_STATIC_PROP(file)), 0, -1); + ct = http_guess_content_type(magic_file, magic_mode, Z_STRVAL_P(*zend_std_get_static_property(THIS_CE, ZEND_STRS("file")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC)), 0, -1); break; } if (ct) { - UPD_STATIC_PROP(string, contentType, ct); + zend_update_static_property_string(THIS_CE, ZEND_STRS("contentType")-1, ct TSRMLS_CC); RETVAL_STRING(ct, 0); } } @@ -573,18 +446,7 @@ PHP_METHOD(HttpResponse, guessContentType) /* }}} */ /* {{{ proto static bool HttpResponse::setContentDisposition(string filename[, bool inline = false]) - * - * Set the Content-Disposition. The Content-Disposition header is very useful - * if the data actually sent came from a file or something similar, that should - * be "saved" by the client/user (i.e. by browsers "Save as..." popup window). - * - * Expects a string parameter specifying the file name the "Save as..." dialog - * should display. Optionally accepts a bool parameter, which, if set to true - * and the user agent knows how to handle the content type, will probably not - * cause the popup window to be shown. - * - * Returns TRUE on success or FALSE on failure. - */ + Set the Content-Disposition. */ PHP_METHOD(HttpResponse, setContentDisposition) { char *file, *cd; @@ -597,41 +459,26 @@ PHP_METHOD(HttpResponse, setContentDisposition) } cd_len = spprintf(&cd, 0, "%s; filename=\"%s\"", send_inline ? "inline" : "attachment", file); - RETVAL_SUCCESS(UPD_STATIC_STRL(contentDisposition, cd, cd_len)); + RETVAL_SUCCESS(zend_update_static_property_stringl(THIS_CE, ZEND_STRS("contentDisposition")-1, cd, cd_len TSRMLS_CC)); efree(cd); } /* }}} */ /* {{{ proto static string HttpResponse::getContentDisposition() - * - * Get current Content-Disposition setting. - * - * Returns the current content disposition as string like sent in a header. - */ + Get current Content-Disposition setting. */ PHP_METHOD(HttpResponse, getContentDisposition) { NO_ARGS; if (return_value_used) { - zval *cd_p, *cd = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(contentDisposition), &cd_p); - - RETVAL_ZVAL(cd, 1, 0); - - if (cd_p) { - zval_ptr_dtor(&cd_p); - } + zval *cdisp = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("contentDisposition")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + RETVAL_ZVAL(cdisp, 1, 1); } } /* }}} */ /* {{{ proto static bool HttpResponse::setETag(string etag) - * - * Set a custom ETag. Use this only if you know what you're doing. - * - * Expects an unquoted string as parameter containing the ETag. - * - * Returns TRUE on success, or FALSE on failure. - */ + Set a custom ETag. Use this only if you know what you're doing. */ PHP_METHOD(HttpResponse, setETag) { char *etag; @@ -641,41 +488,25 @@ PHP_METHOD(HttpResponse, setETag) RETURN_FALSE; } - RETURN_SUCCESS(UPD_STATIC_STRL(eTag, etag, etag_len)); + RETURN_SUCCESS(zend_update_static_property_stringl(THIS_CE, ZEND_STRS("eTag")-1, etag, etag_len TSRMLS_CC)); } /* }}} */ /* {{{ proto static string HttpResponse::getETag() - * - * Get calculated or previously set custom ETag. - * - * Returns the calculated or previously set ETag as unquoted string. - */ + Get calculated or previously set custom ETag. */ PHP_METHOD(HttpResponse, getETag) { NO_ARGS; if (return_value_used) { - zval *etag_p, *etag = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(eTag), &etag_p); - - RETVAL_ZVAL(etag, 1, 0); - - if (etag_p) { - zval_ptr_dtor(&etag_p); - } + zval *etag = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("eTag")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + RETVAL_ZVAL(etag, 1, 1); } } /* }}} */ /* {{{ proto static bool HttpResponse::setLastModified(int timestamp) - * - * Set a custom Last-Modified date. - * - * Expects an unix timestamp as parameter representing the last modification - * time of the sent entity. - * - * Returns TRUE on success, or FALSE on failure. - */ + Set a custom Last-Modified date. */ PHP_METHOD(HttpResponse, setLastModified) { long lm; @@ -684,46 +515,25 @@ PHP_METHOD(HttpResponse, setLastModified) RETURN_FALSE; } - RETURN_SUCCESS(UPD_STATIC_PROP(long, lastModified, lm)); + RETURN_SUCCESS(zend_update_static_property_long(THIS_CE, ZEND_STRS("lastModified")-1, lm TSRMLS_CC)); } /* }}} */ /* {{{ proto static int HttpResponse::getLastModified() - * - * Get calculated or previously set custom Last-Modified date. - * - * Returns the calculated or previously set unix timestamp. - */ + Get calculated or previously set custom Last-Modified date. */ PHP_METHOD(HttpResponse, getLastModified) { NO_ARGS; if (return_value_used) { - zval *lm_p, *lm = convert_to_type_ex(IS_LONG, GET_STATIC_PROP(lastModified), &lm_p); - - RETVAL_ZVAL(lm, 1, 0); - - if (lm_p) { - zval_ptr_dtor(&lm_p); - } + zval *lmod = http_zsep(IS_LONG, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("lastModified")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + RETVAL_ZVAL(lmod, 1, 1); } } /* }}} */ /* {{{ proto static bool HttpResponse::setThrottleDelay(double seconds) - * - * Sets the throttle delay for use with HttpResponse::setBufferSize(). - * - * Provides a basic throttling mechanism, which will yield the current process - * resp. thread until the entity has been completely sent, though. - * - * Note: This doesn't really work with the FastCGI SAPI. - * - * Expects a double parameter specifying the seconds too sleep() after - * each chunk sent. - * - * Returns TRUE on success, or FALSE on failure. - */ + Sets the throttle delay for use with HttpResponse::setBufferSize(). */ PHP_METHOD(HttpResponse, setThrottleDelay) { double seconds; @@ -731,45 +541,25 @@ PHP_METHOD(HttpResponse, setThrottleDelay) if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &seconds)) { RETURN_FALSE; } - RETURN_SUCCESS(UPD_STATIC_PROP(double, throttleDelay, seconds)); + RETURN_SUCCESS(zend_update_static_property_double(THIS_CE, ZEND_STRS("throttleDelay")-1, seconds TSRMLS_CC)); } /* }}} */ /* {{{ proto static double HttpResponse::getThrottleDelay() - * - * Get the current throttle delay. - * - * Returns a double representing the throttle delay in seconds. - */ + Get the current throttle delay. */ PHP_METHOD(HttpResponse, getThrottleDelay) { NO_ARGS; if (return_value_used) { - zval *delay_p, *delay = convert_to_type_ex(IS_DOUBLE, GET_STATIC_PROP(throttleDelay), &delay_p); - - RETVAL_ZVAL(delay, 1, 0); - - if (delay_p) { - zval_ptr_dtor(&delay_p); - } + zval *tdel = http_zsep(IS_DOUBLE, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("throttleDelay")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + RETVAL_ZVAL(tdel, 1, 1); } } /* }}} */ /* {{{ proto static bool HttpResponse::setBufferSize(int bytes) - * - * Sets the send buffer size for use with HttpResponse::setThrottleDelay(). - * - * Provides a basic throttling mechanism, which will yield the current process - * resp. thread until the entity has been completely sent, though. - * - * Note: This doesn't really work with the FastCGI SAPI. - * - * Expects an int parameter representing the chunk size in bytes. - * - * Returns TRUE on success, or FALSE on failure. - */ + Sets the send buffer size for use with HttpResponse::setThrottleDelay(). */ PHP_METHOD(HttpResponse, setBufferSize) { long bytes; @@ -777,61 +567,45 @@ PHP_METHOD(HttpResponse, setBufferSize) if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &bytes)) { RETURN_FALSE; } - RETURN_SUCCESS(UPD_STATIC_PROP(long, bufferSize, bytes)); + RETURN_SUCCESS(zend_update_static_property_long(THIS_CE, ZEND_STRS("bufferSize")-1, bytes TSRMLS_CC)); } /* }}} */ /* {{{ proto static int HttpResponse::getBufferSize() - * - * Get current buffer size. - * - * Returns an int representing the current buffer size in bytes. - */ + Get current buffer size. */ PHP_METHOD(HttpResponse, getBufferSize) { NO_ARGS; if (return_value_used) { - zval *size_p, *size = convert_to_type_ex(IS_LONG, GET_STATIC_PROP(bufferSize), &size_p); - - RETVAL_ZVAL(size, 1, 0); - - if (size_p) { - zval_ptr_dtor(&size_p); - } + zval *bsize = http_zsep(IS_LONG, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("bufferSize")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + RETVAL_ZVAL(bsize, 1, 1); } } /* }}} */ /* {{{ proto static bool HttpResponse::setData(mixed data) - * - * Set the data to be sent. - * - * Expects one parameter, which will be converted to a string and contains - * the data to send. - * - * Returns TRUE on success, or FALSE on failure. - */ + Set the data to be sent. */ PHP_METHOD(HttpResponse, setData) { char *etag; zval *the_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; } if (Z_TYPE_P(the_data) != IS_STRING) { - convert_to_string_ex(&the_data); + convert_to_string(the_data); } - if ( (SUCCESS != SET_STATIC_PROP(data, the_data)) || - (SUCCESS != UPD_STATIC_PROP(long, mode, SEND_DATA))) { + if ( (SUCCESS != zend_update_static_property(THIS_CE, ZEND_STRS("data")-1, the_data TSRMLS_CC)) || + (SUCCESS != zend_update_static_property_long(THIS_CE, ZEND_STRS("mode")-1, SEND_DATA TSRMLS_CC))) { RETURN_FALSE; } - UPD_STATIC_PROP(long, lastModified, http_last_modified(the_data, SEND_DATA)); + zend_update_static_property_long(THIS_CE, ZEND_STRS("lastModified")-1, http_last_modified(the_data, SEND_DATA) TSRMLS_CC); if ((etag = http_etag(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), SEND_DATA))) { - UPD_STATIC_PROP(string, eTag, etag); + zend_update_static_property_string(THIS_CE, ZEND_STRS("eTag")-1, etag TSRMLS_CC); efree(etag); } @@ -840,17 +614,13 @@ PHP_METHOD(HttpResponse, setData) /* }}} */ /* {{{ proto static string HttpResponse::getData() - * - * Get the previously set data to be sent. - * - * Returns a string containing the previously set data to send. - */ + Get the previously set data to be sent. */ PHP_METHOD(HttpResponse, getData) { NO_ARGS; if (return_value_used) { - zval *the_data = GET_STATIC_PROP(data); + zval *the_data = *zend_std_get_static_property(THIS_CE, ZEND_STRS("data")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC); RETURN_ZVAL(the_data, 1, 0); } @@ -858,14 +628,7 @@ PHP_METHOD(HttpResponse, getData) /* }}} */ /* {{{ proto static bool HttpResponse::setStream(resource stream) - * - * Set the resource to be sent. - * - * Expects a resource parameter referencing an already opened stream from - * which the data to send will be read. - * - * Returns TRUE on success, or FALSE on failure. - */ + Set the resource to be sent. */ PHP_METHOD(HttpResponse, setStream) { char *etag; @@ -882,15 +645,15 @@ PHP_METHOD(HttpResponse, setStream) RETURN_FALSE; } - if ( (SUCCESS != UPD_STATIC_PROP(long, stream, Z_LVAL_P(the_stream))) || - (SUCCESS != UPD_STATIC_PROP(long, mode, SEND_RSRC))) { + if ( (SUCCESS != zend_update_static_property_long(THIS_CE, ZEND_STRS("stream")-1, Z_LVAL_P(the_stream) TSRMLS_CC)) || + (SUCCESS != zend_update_static_property_long(THIS_CE, ZEND_STRS("mode")-1, SEND_RSRC TSRMLS_CC))) { RETURN_FALSE; } zend_list_addref(Z_LVAL_P(the_stream)); - UPD_STATIC_PROP(long, lastModified, http_last_modified(the_real_stream, SEND_RSRC)); + zend_update_static_property_long(THIS_CE, ZEND_STRS("lastModified")-1, http_last_modified(the_real_stream, SEND_RSRC) TSRMLS_CC); if ((etag = http_etag(the_real_stream, 0, SEND_RSRC))) { - UPD_STATIC_PROP(string, eTag, etag); + zend_update_static_property_string(THIS_CE, ZEND_STRS("eTag")-1, etag TSRMLS_CC); efree(etag); } @@ -899,35 +662,21 @@ PHP_METHOD(HttpResponse, setStream) /* }}} */ /* {{{ proto static resource HttpResponse::getStream() - * - * Get the previously set resource to be sent. - * - * Returns the previously set resource. - */ + Get the previously set resource to be sent. */ PHP_METHOD(HttpResponse, getStream) { NO_ARGS; if (return_value_used) { - zval *stream_p; - - RETVAL_RESOURCE(Z_LVAL_P(convert_to_type_ex(IS_LONG, GET_STATIC_PROP(stream), &stream_p))); - - if (stream_p) { - zval_ptr_dtor(&stream_p); - } + zval *stream = http_zsep(IS_LONG, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("stream")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + RETVAL_RESOURCE(Z_LVAL_P(stream)); + zval_ptr_dtor(&stream); } } /* }}} */ /* {{{ proto static bool HttpResponse::setFile(string file) - * - * Set the file to be sent. - * - * Expects a string as parameter, specifying the path to the file to send. - * - * Returns TRUE on success, or FALSE on failure. - */ + Set the file to be sent. */ PHP_METHOD(HttpResponse, setFile) { char *the_file, *etag; @@ -942,14 +691,14 @@ PHP_METHOD(HttpResponse, setFile) RETURN_FALSE; } - if ( (SUCCESS != UPD_STATIC_STRL(file, the_file, file_len)) || - (SUCCESS != UPD_STATIC_PROP(long, mode, -1))) { + if ( (SUCCESS != zend_update_static_property_stringl(THIS_CE, ZEND_STRS("file")-1, the_file, file_len TSRMLS_CC)) || + (SUCCESS != zend_update_static_property_long(THIS_CE, ZEND_STRS("mode")-1, -1 TSRMLS_CC))) { RETURN_FALSE; } - UPD_STATIC_PROP(long, lastModified, http_last_modified(the_file, -1)); + zend_update_static_property_long(THIS_CE, ZEND_STRS("lastModified")-1, http_last_modified(the_file, -1) TSRMLS_CC); if ((etag = http_etag(the_file, 0, -1))) { - UPD_STATIC_PROP(string, eTag, etag); + zend_update_static_property_string(THIS_CE, ZEND_STRS("eTag")-1, etag TSRMLS_CC); efree(etag); } @@ -958,51 +707,20 @@ PHP_METHOD(HttpResponse, setFile) /* }}} */ /* {{{ proto static string HttpResponse::getFile() - * - * Get the previously set file to be sent. - * - * Returns the previously set path to the file to send as string. - */ + Get the previously set file to be sent. */ PHP_METHOD(HttpResponse, getFile) { NO_ARGS; if (return_value_used) { - zval *the_file_p, *the_file = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(file), &the_file_p); - - RETVAL_ZVAL(the_file, 1, 0); - - if (the_file_p) { - zval_ptr_dtor(&the_file_p); - } + zval *file = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("file")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + RETVAL_ZVAL(file, 1, 1); } } /* }}} */ /* {{{ proto static bool HttpResponse::send([bool clean_ob = true]) - * - * Finally send the entity. - * - * Accepts an optional boolean parameter, specifying whether the output - * buffers should be discarded prior sending. A successful caching attempt - * will cause a script termination, and write a log entry if the INI setting - * http.cache_log is set. - * - * Returns TRUE on success, or FALSE on failure. - * - * Throws HttpHeaderException, HttpResponseException if http.only_exceptions is TRUE. - * - * Example: - * 
- * 
- *
- */ + Finally send the entity. */ PHP_METHOD(HttpResponse, send) { zval *sent; @@ -1014,7 +732,7 @@ PHP_METHOD(HttpResponse, send) HTTP_CHECK_HEADERS_SENT(RETURN_FALSE); - sent = GET_STATIC_PROP(sent); + sent = *zend_std_get_static_property(THIS_CE, ZEND_STRS("sent")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC); if (Z_LVAL_P(sent)) { http_error(HE_WARNING, HTTP_E_RESPONSE, "Cannot send HttpResponse, response has already been sent"); RETURN_FALSE; @@ -1023,26 +741,24 @@ PHP_METHOD(HttpResponse, send) } /* capture mode */ - if (zval_is_true(GET_STATIC_PROP(catch))) { - zval *etag_p, *the_data; + if (i_zend_is_true(*zend_std_get_static_property(THIS_CE, ZEND_STRS("catch")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))) { + zval *zetag, *the_data; MAKE_STD_ZVAL(the_data); php_ob_get_buffer(the_data TSRMLS_CC); - SET_STATIC_PROP(data, the_data); - ZVAL_LONG(GET_STATIC_PROP(mode), SEND_DATA); + zend_update_static_property(THIS_CE, ZEND_STRS("data")-1, the_data TSRMLS_CC); + ZVAL_LONG(*zend_std_get_static_property(THIS_CE, ZEND_STRS("mode")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC), SEND_DATA); - if (!Z_STRLEN_P(convert_to_type_ex(IS_STRING, GET_STATIC_PROP(eTag), &etag_p))) { + zetag = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("eTag")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + if (!Z_STRLEN_P(zetag)) { char *etag = http_etag(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), SEND_DATA); if (etag) { - UPD_STATIC_PROP(string, eTag, etag); + zend_update_static_property_string(THIS_CE, ZEND_STRS("eTag")-1, etag TSRMLS_CC); efree(etag); } } zval_ptr_dtor(&the_data); - - if (etag_p) { - zval_ptr_dtor(&etag_p); - } + zval_ptr_dtor(&zetag); clean_ob = 1; } @@ -1055,12 +771,12 @@ PHP_METHOD(HttpResponse, send) } /* caching */ - if (zval_is_true(GET_STATIC_PROP(cache))) { - zval *cctl, *cctl_p, *etag, *etag_p, *lmod, *lmod_p; + if (i_zend_is_true(*zend_std_get_static_property(THIS_CE, ZEND_STRS("cache")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))) { + zval *cctl, *etag, *lmod; - etag = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(eTag), &etag_p); - lmod = convert_to_type_ex(IS_LONG, GET_STATIC_PROP(lastModified), &lmod_p); - cctl = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(cacheControl), &cctl_p); + lmod = http_zsep(IS_LONG, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("lastModified")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + etag = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("eTag")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + cctl = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("cacheControl")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); if (Z_LVAL_P(lmod) || Z_STRLEN_P(etag)) { if (Z_STRLEN_P(cctl)) { @@ -1076,14 +792,14 @@ PHP_METHOD(HttpResponse, send) } } - if (etag_p) zval_ptr_dtor(&etag_p); - if (lmod_p) zval_ptr_dtor(&lmod_p); - if (cctl_p) zval_ptr_dtor(&cctl_p); + zval_ptr_dtor(&etag); + zval_ptr_dtor(&lmod); + zval_ptr_dtor(&cctl); } /* content type */ { - zval *ctype_p, *ctype = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(contentType), &ctype_p); + zval *ctype = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("contentType")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); if (Z_STRLEN_P(ctype)) { http_send_content_type(Z_STRVAL_P(ctype), Z_STRLEN_P(ctype)); } else { @@ -1096,61 +812,57 @@ PHP_METHOD(HttpResponse, send) http_send_content_type("application/x-octetstream", lenof("application/x-octetstream")); } } - if (ctype_p) { - zval_ptr_dtor(&ctype_p); - } + zval_ptr_dtor(&ctype); } /* content disposition */ { - zval *cd_p, *cd = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(contentDisposition), &cd_p); + zval *cd = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("contentDisposition")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); if (Z_STRLEN_P(cd)) { http_send_header_ex("Content-Disposition", lenof("Content-Disposition"), Z_STRVAL_P(cd), Z_STRLEN_P(cd), 1, NULL); } - if (cd_p) { - zval_ptr_dtor(&cd_p); - } + zval_ptr_dtor(&cd); } /* throttling */ { - zval *bsize_p, *bsize = convert_to_type_ex(IS_LONG, GET_STATIC_PROP(bufferSize), &bsize_p); - zval *delay_p, *delay = convert_to_type_ex(IS_DOUBLE, GET_STATIC_PROP(throttleDelay), &delay_p); + zval *bsize = http_zsep(IS_LONG, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("bufferSize")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + zval *delay = http_zsep(IS_DOUBLE, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("throttleDelay")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); HTTP_G->send.buffer_size = Z_LVAL_P(bsize); HTTP_G->send.throttle_delay = Z_DVAL_P(delay); - if (bsize_p) zval_ptr_dtor(&bsize_p); - if (delay_p) zval_ptr_dtor(&delay_p); + zval_ptr_dtor(&bsize); + zval_ptr_dtor(&delay); } /* gzip */ - HTTP_G->send.deflate.response = zval_is_true(GET_STATIC_PROP(gzip)); + HTTP_G->send.deflate.response = i_zend_is_true(*zend_std_get_static_property(THIS_CE, ZEND_STRS("gzip")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC)); /* send */ - switch (Z_LVAL_P(GET_STATIC_PROP(mode))) { + switch (Z_LVAL_P(*zend_std_get_static_property(THIS_CE, ZEND_STRS("mode")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))) { case SEND_DATA: { - zval *zdata_p, *zdata = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(data), &zdata_p); + zval *zdata = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("data")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); RETVAL_SUCCESS(http_send_data(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata))); - if (zdata_p) zval_ptr_dtor(&zdata_p); + zval_ptr_dtor(&zdata); return; } case SEND_RSRC: { php_stream *the_real_stream; - zval *the_stream_p, *the_stream = convert_to_type_ex(IS_LONG, GET_STATIC_PROP(stream), &the_stream_p); + zval *the_stream = http_zsep(IS_LONG, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("stream")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); the_stream->type = IS_RESOURCE; php_stream_from_zval(the_real_stream, &the_stream); RETVAL_SUCCESS(http_send_stream(the_real_stream)); - if (the_stream_p) zval_ptr_dtor(&the_stream_p); + zval_ptr_dtor(&the_stream); return; } default: { - zval *file_p; - RETVAL_SUCCESS(http_send_file(Z_STRVAL_P(convert_to_type_ex(IS_STRING, GET_STATIC_PROP(file), &file_p)))); - if (file_p) zval_ptr_dtor(&file_p); + zval *file = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("file")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + RETVAL_SUCCESS(http_send_file(Z_STRVAL_P(file))); + zval_ptr_dtor(&file); return; } } @@ -1158,17 +870,7 @@ PHP_METHOD(HttpResponse, send) /* }}} */ /* {{{ proto static void HttpResponse::capture() - * - * Capture script output. - * - * Example: - * 
- * 
- *
+ Capture script output. */ PHP_METHOD(HttpResponse, capture) { @@ -1176,7 +878,7 @@ PHP_METHOD(HttpResponse, capture) HTTP_CHECK_HEADERS_SENT(RETURN_FALSE); - UPD_STATIC_PROP(long, catch, 1); + zend_update_static_property_long(THIS_CE, ZEND_STRS("catch")-1, 1 TSRMLS_CC); php_end_ob_buffers(0 TSRMLS_CC); php_start_ob_buffer(NULL, 0, 0 TSRMLS_CC);