X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_env_response.c;h=80043a22f089ff7d562a4822c935ff2b00ee7136;hb=8d084b7e31a4985d75e74efbabf21a818513fd0f;hp=f9e8c4cb43ce7045679a3963810e5ac06270df9c;hpb=7b6175452cb0a9154da31dd571c1425951ec6547;p=m6w6%2Fext-http diff --git a/php_http_env_response.c b/php_http_env_response.c index f9e8c4c..80043a2 100644 --- a/php_http_env_response.c +++ b/php_http_env_response.c @@ -60,14 +60,16 @@ static void set_option(zval *options, const char *name_str, size_t name_len, int } } } -static zval *get_option(zval *options, const char *name_str, size_t name_len) +static zval *get_option(zval *options, const char *name_str, size_t name_len, zval *tmp) { - zval *val; + zval *val = NULL; if (Z_TYPE_P(options) == IS_OBJECT) { - val = zend_read_property(Z_OBJCE_P(options), options, name_str, name_len, 0); - } else { + val = zend_read_property(Z_OBJCE_P(options), options, name_str, name_len, 0, tmp); + } else if (Z_TYPE_P(options) == IS_ARRAY) { val = zend_symtable_str_find(Z_ARRVAL_P(options), name_str, name_len); + } else { + abort(); } if (val) { Z_TRY_ADDREF_P(val); @@ -76,65 +78,62 @@ static zval *get_option(zval *options, const char *name_str, size_t name_len) } static php_http_message_body_t *get_body(zval *options) { - zval *zbody; + zval zbody_tmp, *zbody; php_http_message_body_t *body = NULL; - if ((zbody = get_option(options, ZEND_STRL("body")))) { + if ((zbody = get_option(options, ZEND_STRL("body"), &zbody_tmp))) { if ((Z_TYPE_P(zbody) == IS_OBJECT) && instanceof_function(Z_OBJCE_P(zbody), php_http_message_body_class_entry)) { php_http_message_body_object_t *body_obj = PHP_HTTP_OBJ(NULL, zbody); body = body_obj->body; } - zval_ptr_dtor(zbody); + Z_TRY_DELREF_P(zbody); } return body; } static php_http_message_t *get_request(zval *options) { - zval *zrequest; + zval zrequest_tmp, *zrequest; php_http_message_t *request = NULL; - if ((zrequest = get_option(options, ZEND_STRL("request")))) { + if ((zrequest = get_option(options, ZEND_STRL("request"), &zrequest_tmp))) { if (Z_TYPE_P(zrequest) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zrequest), php_http_message_class_entry)) { php_http_message_object_t *request_obj = PHP_HTTP_OBJ(NULL, zrequest); request = request_obj->message; } - zval_ptr_dtor(zrequest); + Z_TRY_DELREF_P(zrequest); } return request; } -static void set_cookie(zval *options, zval *zcookie_new TSRMLS_DC) +static void set_cookie(zval *options, zval *zcookie_new) { - zval *zcookies_set; + zval tmp, zcookies_set_tmp, *zcookies_set; php_http_arrkey_t key; php_http_cookie_object_t *obj = PHP_HTTP_OBJ(NULL, zcookie_new); - zcookies_set = get_option(options, ZEND_STRL("cookies")); - if (!zcookies_set || Z_TYPE_P(zcookies_set) != IS_ARRAY) { - if (zcookies_set) { - zval_ptr_dtor(zcookies_set); - } - array_init_size(zcookies_set, zend_hash_num_elements(&obj->list->cookies)); - } else { - SEPARATE_ZVAL(zcookies_set); + array_init(&tmp); + zcookies_set = get_option(options, ZEND_STRL("cookies"), &zcookies_set_tmp); + if (zcookies_set && Z_TYPE_P(zcookies_set) == IS_ARRAY) { + array_copy(Z_ARRVAL_P(zcookies_set), Z_ARRVAL(tmp)); + zval_ptr_dtor(zcookies_set); } ZEND_HASH_FOREACH_KEY(&obj->list->cookies, key.h, key.key) { Z_ADDREF_P(zcookie_new); if (key.key) { - add_assoc_zval_ex(zcookies_set, key.key->val, key.key->len, zcookie_new); + add_assoc_zval_ex(&tmp, key.key->val, key.key->len, zcookie_new); } else { - add_index_zval(zcookies_set, key.h, zcookie_new); + add_index_zval(&tmp, key.h, zcookie_new); } } ZEND_HASH_FOREACH_END(); - set_option(options, ZEND_STRL("cookies"), IS_ARRAY, zcookies_set, 0); - zval_ptr_dtor(zcookies_set); + set_option(options, ZEND_STRL("cookies"), IS_ARRAY, &tmp, 0); + zval_ptr_dtor(&tmp); } php_http_cache_status_t php_http_env_is_response_cached_by_etag(zval *options, const char *header_str, size_t header_len, php_http_message_t *request) @@ -142,14 +141,14 @@ php_http_cache_status_t php_http_env_is_response_cached_by_etag(zval *options, c php_http_cache_status_t ret = PHP_HTTP_CACHE_NO; char *header = NULL, *etag = NULL; php_http_message_body_t *body; - zval *zetag; + zval zetag_tmp, *zetag; if (!(body = get_body(options))) { return ret; } - if ((zetag = get_option(options, ZEND_STRL("etag")))) { + if ((zetag = get_option(options, ZEND_STRL("etag"), &zetag_tmp)) && Z_TYPE_P(zetag) != IS_NULL) { zend_string *zs = zval_get_string(zetag); etag = estrndup(zs->val, zs->len); zend_string_release(zs); @@ -176,13 +175,13 @@ php_http_cache_status_t php_http_env_is_response_cached_by_last_modified(zval *o char *header; time_t ums, lm = 0; php_http_message_body_t *body; - zval *zlm; + zval zlm_tmp, *zlm; if (!(body = get_body(options))) { return ret; } - if ((zlm = get_option(options, ZEND_STRL("lastModified")))) { + if ((zlm = get_option(options, ZEND_STRL("lastModified"), &zlm_tmp))) { lm = zval_get_long(zlm); zval_ptr_dtor(zlm); } @@ -332,13 +331,13 @@ void php_http_env_response_free(php_http_env_response_t **r) static ZEND_RESULT_CODE php_http_env_response_send_head(php_http_env_response_t *r, php_http_message_t *request) { ZEND_RESULT_CODE ret = SUCCESS; - zval *zoption, *options = &r->options; + zval zoption_tmp, *zoption, *options = &r->options; if (r->done) { return ret; } - if ((zoption = get_option(options, ZEND_STRL("headers")))) { + if ((zoption = get_option(options, ZEND_STRL("headers"), &zoption_tmp))) { if (Z_TYPE_P(zoption) == IS_ARRAY) { php_http_header_to_callback(Z_ARRVAL_P(zoption), 0, (php_http_pass_format_callback_t) r->ops->set_header, r); } @@ -349,7 +348,7 @@ static ZEND_RESULT_CODE php_http_env_response_send_head(php_http_env_response_t return ret; } - if ((zoption = get_option(options, ZEND_STRL("responseCode")))) { + if ((zoption = get_option(options, ZEND_STRL("responseCode"), &zoption_tmp))) { zend_long rc = zval_get_long(zoption); zval_ptr_dtor(zoption); @@ -362,7 +361,7 @@ static ZEND_RESULT_CODE php_http_env_response_send_head(php_http_env_response_t return ret; } - if ((zoption = get_option(options, ZEND_STRL("httpVersion")))) { + if ((zoption = get_option(options, ZEND_STRL("httpVersion"), &zoption_tmp))) { php_http_version_t v; zend_string *zs = zval_get_string(zoption); @@ -378,7 +377,7 @@ static ZEND_RESULT_CODE php_http_env_response_send_head(php_http_env_response_t return ret; } - if ((zoption = get_option(options, ZEND_STRL("cookies")))) { + if ((zoption = get_option(options, ZEND_STRL("cookies"), &zoption_tmp))) { if (Z_TYPE_P(zoption) == IS_ARRAY) { zval *zcookie; @@ -406,7 +405,7 @@ static ZEND_RESULT_CODE php_http_env_response_send_head(php_http_env_response_t return ret; } - if ((zoption = get_option(options, ZEND_STRL("contentType")))) { + if ((zoption = get_option(options, ZEND_STRL("contentType"), &zoption_tmp))) { zend_string *zs = zval_get_string(zoption); zval_ptr_dtor(zoption); @@ -444,7 +443,7 @@ static ZEND_RESULT_CODE php_http_env_response_send_head(php_http_env_response_t } } } else { - if ((zoption = get_option(options, ZEND_STRL("cacheControl")))) { + if ((zoption = get_option(options, ZEND_STRL("cacheControl"), &zoption_tmp))) { zend_string *zs = zval_get_string(zoption); zval_ptr_dtor(zoption); @@ -458,25 +457,20 @@ static ZEND_RESULT_CODE php_http_env_response_send_head(php_http_env_response_t return ret; } - if ((zoption = get_option(options, ZEND_STRL("contentDisposition")))) { - php_http_buffer_t buf; + if ((zoption = get_option(options, ZEND_STRL("contentDisposition"), &zoption_tmp))) { - if (Z_TYPE_P(zoption) != IS_ARRAY) { - zval *tmp = zoption; - SEPARATE_ZVAL(tmp); - convert_to_array(tmp); - zval_ptr_dtor(zoption); - zoption = tmp; - } + if (Z_TYPE_P(zoption) == IS_ARRAY) { + php_http_buffer_t buf; - php_http_buffer_init(&buf); - if (php_http_params_to_string(&buf, Z_ARRVAL_P(zoption), ZEND_STRL(","), ZEND_STRL(";"), ZEND_STRL("="), PHP_HTTP_PARAMS_DEFAULT)) { - if (buf.used) { - ret = r->ops->set_header(r, "Content-Disposition: %.*s", buf.used, buf.data); + php_http_buffer_init(&buf); + if (php_http_params_to_string(&buf, Z_ARRVAL_P(zoption), ZEND_STRL(","), ZEND_STRL(";"), ZEND_STRL("="), PHP_HTTP_PARAMS_DEFAULT)) { + if (buf.used) { + ret = r->ops->set_header(r, "Content-Disposition: %.*s", buf.used, buf.data); + } } - } - php_http_buffer_dtor(&buf); + php_http_buffer_dtor(&buf); + } zval_ptr_dtor(zoption); } @@ -484,7 +478,7 @@ static ZEND_RESULT_CODE php_http_env_response_send_head(php_http_env_response_t return ret; } - if ((zoption = get_option(options, ZEND_STRL("contentEncoding")))) { + if ((zoption = get_option(options, ZEND_STRL("contentEncoding"), &zoption_tmp))) { zend_long ce = zval_get_long(zoption); zval zsupported; HashTable *result = NULL; @@ -502,7 +496,7 @@ static ZEND_RESULT_CODE php_http_env_response_send_head(php_http_env_response_t zend_ulong index = 0; zend_hash_internal_pointer_reset(result); - if (HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(result, &key_str, &index, NULL)) { + if (HASH_KEY_IS_STRING == zend_hash_get_current_key(result, &key_str, &index)) { if (zend_string_equals_literal(key_str, "gzip")) { if (!(r->content.encoder = php_http_encoding_stream_init(NULL, php_http_encoding_stream_get_deflate_ops(), PHP_HTTP_DEFLATE_TYPE_GZIP))) { ret = FAILURE; @@ -559,7 +553,7 @@ static ZEND_RESULT_CODE php_http_env_response_send_head(php_http_env_response_t break; } - if ((zoption = get_option(options, ZEND_STRL("etag")))) { + if ((zoption = get_option(options, ZEND_STRL("etag"), &zoption_tmp))) { zend_string *zs = zval_get_string(zoption); zval_ptr_dtor(zoption); @@ -570,7 +564,7 @@ static ZEND_RESULT_CODE php_http_env_response_send_head(php_http_env_response_t } zend_string_release(zs); } - if ((zoption = get_option(options, ZEND_STRL("lastModified") TSRMLS_CC))) { + if ((zoption = get_option(options, ZEND_STRL("lastModified"), &zoption_tmp))) { zend_long lm = zval_get_long(zoption); zval_ptr_dtor(zoption); @@ -591,7 +585,7 @@ static ZEND_RESULT_CODE php_http_env_response_send_head(php_http_env_response_t static ZEND_RESULT_CODE php_http_env_response_send_body(php_http_env_response_t *r) { ZEND_RESULT_CODE ret = SUCCESS; - zval *zoption; + zval zoption_tmp, *zoption; php_http_message_body_t *body; if (r->done) { @@ -599,11 +593,11 @@ static ZEND_RESULT_CODE php_http_env_response_send_body(php_http_env_response_t } if ((body = get_body(&r->options))) { - if ((zoption = get_option(&r->options, ZEND_STRL("throttleDelay")))) { + if ((zoption = get_option(&r->options, ZEND_STRL("throttleDelay"), &zoption_tmp))) { r->throttle.delay = zval_get_double(zoption); zval_ptr_dtor(zoption); } - if ((zoption = get_option(&r->options, ZEND_STRL("throttleChunk") TSRMLS_CC))) { + if ((zoption = get_option(&r->options, ZEND_STRL("throttleChunk"), &zoption_tmp))) { r->throttle.chunk = zval_get_long(zoption); zval_ptr_dtor(zoption); } @@ -936,6 +930,8 @@ static ZEND_RESULT_CODE php_http_env_response_stream_set_header_ex(php_http_env_ char *header_end, *header_str = NULL; size_t header_len = 0; zval zheader, *zheader_ptr; + zend_string *header_key; + ZEND_RESULT_CODE rv; if (stream_ctx->started || stream_ctx->finished) { return FAILURE; @@ -948,22 +944,21 @@ static ZEND_RESULT_CODE php_http_env_response_stream_set_header_ex(php_http_env_ return FAILURE; } - *header_end = '\0'; + header_key = zend_string_init(header_str, header_end - header_str, 0); - if (!replace && (zheader_ptr = zend_hash_str_find(&stream_ctx->header, header_str, header_end - header_str))) { + if (!replace && (zheader_ptr = zend_hash_find(&stream_ctx->header, header_key))) { convert_to_array(zheader_ptr); - *header_end = ':'; - return add_next_index_str(zheader_ptr, php_http_cs2zs(header_str, header_len)); + rv = add_next_index_str(zheader_ptr, php_http_cs2zs(header_str, header_len)); } else { ZVAL_STR(&zheader, php_http_cs2zs(header_str, header_len)); - if (SUCCESS != zend_hash_str_update(&stream_ctx->header, header_str, header_end - header_str, &zheader)) { - return FAILURE; - } - - *header_end = ':'; - return SUCCESS; + rv = zend_hash_update(&stream_ctx->header, header_key, &zheader) + ? SUCCESS : FAILURE; } + + zend_string_release(header_key); + + return rv; } static ZEND_RESULT_CODE php_http_env_response_stream_set_header(php_http_env_response_t *r, const char *fmt, ...) { @@ -1278,14 +1273,15 @@ static PHP_METHOD(HttpEnvResponse, setCookie) case IS_ARRAY: list = php_http_cookie_list_from_struct(NULL, zcookie_new); zcookie_new = &tmp; - ZVAL_OBJ(zcookie_new, &php_http_cookie_object_new_ex(php_http_cookie_class_entry, list)->zo); + ZVAL_OBJECT(zcookie_new, &php_http_cookie_object_new_ex(php_http_cookie_class_entry, list)->zo, 1); break; default: zs = zval_get_string(zcookie_new); list = php_http_cookie_list_parse(NULL, zs->val, zs->len, 0, NULL); + zend_string_release(zs); zcookie_new = &tmp; - ZVAL_OBJ(zcookie_new, &php_http_cookie_object_new_ex(php_http_cookie_class_entry, list)->zo); + ZVAL_OBJECT(zcookie_new, &php_http_cookie_object_new_ex(php_http_cookie_class_entry, list)->zo, 1); } zend_restore_error_handling(&zeh);