X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_env_response.c;h=9bc3f5bc394e743f3759dd0ee0da869b893266c1;hp=0b195b6a7abdc7545e06931233916449bb48592f;hb=4bf1b4570329514fa00dc68c6e02f581c3792d73;hpb=9e2e73504c7c1f4a12268dc18b1409af63765855 diff --git a/php_http_env_response.c b/php_http_env_response.c index 0b195b6..9bc3f5b 100644 --- a/php_http_env_response.c +++ b/php_http_env_response.c @@ -60,12 +60,12 @@ 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 = NULL; if (Z_TYPE_P(options) == IS_OBJECT) { - val = zend_read_property(Z_OBJCE_P(options), options, name_str, name_len, 0); + 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 { @@ -78,10 +78,10 @@ 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); @@ -94,10 +94,10 @@ static php_http_message_body_t *get_body(zval *options) } 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); @@ -110,12 +110,12 @@ static php_http_message_t *get_request(zval *options) } static void set_cookie(zval *options, zval *zcookie_new) { - zval tmp, *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); array_init(&tmp); - zcookies_set = get_option(options, ZEND_STRL("cookies")); + 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); @@ -141,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"))) && Z_TYPE_P(zetag) != IS_NULL) { + 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); @@ -175,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); } @@ -207,7 +207,9 @@ php_http_cache_status_t php_http_env_is_response_cached_by_last_modified(zval *o static zend_bool php_http_env_response_is_cacheable(php_http_env_response_t *r, php_http_message_t *request) { - if (r->ops->get_status(r) >= 400) { + long status = r->ops->get_status(r); + + if (status && status / 100 != 2) { return 0; } @@ -331,13 +333,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); } @@ -348,7 +350,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); @@ -361,7 +363,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); @@ -377,7 +379,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; @@ -405,7 +407,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); @@ -443,7 +445,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); @@ -457,7 +459,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("contentDisposition")))) { + if ((zoption = get_option(options, ZEND_STRL("contentDisposition"), &zoption_tmp))) { if (Z_TYPE_P(zoption) == IS_ARRAY) { php_http_buffer_t buf; @@ -478,7 +480,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; @@ -553,7 +555,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); @@ -564,7 +566,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); @@ -585,7 +587,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) { @@ -593,11 +595,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); } @@ -834,14 +836,18 @@ typedef struct php_http_env_response_stream_ctx { long status_code; php_stream *stream; + php_stream_filter *chunked_filter; + php_http_message_t *request; unsigned started:1; unsigned finished:1; + unsigned chunked:1; } php_http_env_response_stream_ctx_t; static ZEND_RESULT_CODE php_http_env_response_stream_init(php_http_env_response_t *r, void *init_arg) { php_http_env_response_stream_ctx_t *ctx; + size_t buffer_size = 0x1000; ctx = ecalloc(1, sizeof(*ctx)); @@ -849,7 +855,15 @@ static ZEND_RESULT_CODE php_http_env_response_stream_init(php_http_env_response_ ++GC_REFCOUNT(ctx->stream->res); ZEND_INIT_SYMTABLE(&ctx->header); php_http_version_init(&ctx->version, 1, 1); + php_stream_set_option(ctx->stream, PHP_STREAM_OPTION_WRITE_BUFFER, PHP_STREAM_BUFFER_FULL, &buffer_size); ctx->status_code = 200; + ctx->chunked = 1; + ctx->request = get_request(&r->options); + + /* there are some limitations regarding TE:chunked, see https://tools.ietf.org/html/rfc7230#section-3.3.1 */ + if (ctx->request && ctx->request->http.version.major == 1 && ctx->request->http.version.minor == 0) { + ctx->version.minor = 0; + } r->ctx = ctx; @@ -859,24 +873,33 @@ static void php_http_env_response_stream_dtor(php_http_env_response_t *r) { php_http_env_response_stream_ctx_t *ctx = r->ctx; + if (ctx->chunked_filter) { + ctx->chunked_filter = php_stream_filter_remove(ctx->chunked_filter, 1); + } zend_hash_destroy(&ctx->header); zend_list_delete(ctx->stream->res); efree(ctx); r->ctx = NULL; } -static void php_http_env_response_stream_header(php_http_env_response_stream_ctx_t *ctx, HashTable *header) +static void php_http_env_response_stream_header(php_http_env_response_stream_ctx_t *ctx, HashTable *header, php_http_buffer_t *buf) { zval *val; ZEND_HASH_FOREACH_VAL(header, val) { if (Z_TYPE_P(val) == IS_ARRAY) { - php_http_env_response_stream_header(ctx, Z_ARRVAL_P(val)); + php_http_env_response_stream_header(ctx, Z_ARRVAL_P(val), buf); } else { zend_string *zs = zval_get_string(val); - php_stream_write(ctx->stream, zs->val, zs->len); - php_stream_write_string(ctx->stream, PHP_HTTP_CRLF); + if (ctx->chunked) { + /* disable chunked transfer encoding if we've got an explicit content-length */ + if (!strncasecmp(zs->val, "Content-Length:", lenof("Content-Length:"))) { + ctx->chunked = 0; + } + } + php_http_buffer_append(buf, zs->val, zs->len); + php_http_buffer_appends(buf, PHP_HTTP_CRLF); zend_string_release(zs); } } @@ -884,15 +907,45 @@ static void php_http_env_response_stream_header(php_http_env_response_stream_ctx } static ZEND_RESULT_CODE php_http_env_response_stream_start(php_http_env_response_stream_ctx_t *ctx) { + php_http_buffer_t header_buf; + if (ctx->started || ctx->finished) { return FAILURE; } - php_stream_printf(ctx->stream TSRMLS_CC, "HTTP/%u.%u %ld %s" PHP_HTTP_CRLF, ctx->version.major, ctx->version.minor, ctx->status_code, php_http_env_get_response_status_for_code(ctx->status_code)); - php_http_env_response_stream_header(ctx, &ctx->header); - php_stream_write_string(ctx->stream, PHP_HTTP_CRLF); - ctx->started = 1; - return SUCCESS; + php_http_buffer_init(&header_buf); + php_http_buffer_appendf(&header_buf, "HTTP/%u.%u %ld %s" PHP_HTTP_CRLF, ctx->version.major, ctx->version.minor, ctx->status_code, php_http_env_get_response_status_for_code(ctx->status_code)); + + /* there are some limitations regarding TE:chunked, see https://tools.ietf.org/html/rfc7230#section-3.3.1 */ + if (ctx->version.major == 1 && ctx->version.minor == 0) { + ctx->chunked = 0; + } else if (ctx->status_code == 204 || ctx->status_code/100 == 1) { + ctx->chunked = 0; + } else if (ctx->request && ctx->status_code/100 == 2 && !strcasecmp(ctx->request->http.info.request.method, "CONNECT")) { + ctx->chunked = 0; + } + + php_http_env_response_stream_header(ctx, &ctx->header, &header_buf); + + /* enable chunked transfer encoding */ + if (ctx->chunked) { + php_http_buffer_appends(&header_buf, "Transfer-Encoding: chunked" PHP_HTTP_CRLF); + } + + php_http_buffer_appends(&header_buf, PHP_HTTP_CRLF); + + if (header_buf.used == php_stream_write(ctx->stream, header_buf.data, header_buf.used)) { + ctx->started = 1; + } + php_http_buffer_dtor(&header_buf); + php_stream_flush(ctx->stream); + + if (ctx->chunked) { + ctx->chunked_filter = php_stream_filter_create("http.chunked_encode", NULL, 0); + php_stream_filter_append(&ctx->stream->writefilters, ctx->chunked_filter); + } + + return ctx->started ? SUCCESS : FAILURE; } static long php_http_env_response_stream_get_status(php_http_env_response_t *r) { @@ -1029,18 +1082,24 @@ static ZEND_RESULT_CODE php_http_env_response_stream_flush(php_http_env_response } static ZEND_RESULT_CODE php_http_env_response_stream_finish(php_http_env_response_t *r) { - php_http_env_response_stream_ctx_t *stream_ctx = r->ctx; + php_http_env_response_stream_ctx_t *ctx = r->ctx; - if (stream_ctx->finished) { + if (ctx->finished) { return FAILURE; } - if (!stream_ctx->started) { - if (SUCCESS != php_http_env_response_stream_start(stream_ctx)) { + if (!ctx->started) { + if (SUCCESS != php_http_env_response_stream_start(ctx)) { return FAILURE; } } - stream_ctx->finished = 1; + php_stream_flush(ctx->stream); + if (ctx->chunked && ctx->chunked_filter) { + php_stream_filter_flush(ctx->chunked_filter, 1); + ctx->chunked_filter = php_stream_filter_remove(ctx->chunked_filter, 1); + } + + ctx->finished = 1; return SUCCESS; } @@ -1099,8 +1158,15 @@ static PHP_METHOD(HttpEnvResponse, __invoke) PHP_HTTP_ENV_RESPONSE_OBJECT_INIT(obj); - php_http_message_object_init_body_object(obj); - php_http_message_body_append(obj->message->body, ob_str, ob_len); + if (!obj->body) { + php_http_message_object_init_body_object(obj); + } + + if (ob_flags & PHP_OUTPUT_HANDLER_CLEAN) { + php_stream_truncate_set_size(php_http_message_body_stream(obj->message->body), 0); + } else { + php_http_message_body_append(obj->message->body, ob_str, ob_len); + } RETURN_TRUE; } } @@ -1115,7 +1181,7 @@ static PHP_METHOD(HttpEnvResponse, setEnvRequest) php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|O", &env_req, php_http_message_class_entry), invalid_arg, return); set_option(getThis(), ZEND_STRL("request"), IS_OBJECT, env_req, 0); - RETVAL_ZVAL_FAST(getThis()); + RETVAL_ZVAL(getThis(), 1, 0); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnvResponse_setContentType, 0, 0, 1) @@ -1129,7 +1195,7 @@ static PHP_METHOD(HttpEnvResponse, setContentType) php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s!", &ct_str, &ct_len), invalid_arg, return); set_option(getThis(), ZEND_STRL("contentType"), IS_STRING, ct_str, ct_len); - RETVAL_ZVAL_FAST(getThis()); + RETVAL_ZVAL(getThis(), 1, 0); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnvResponse_setContentDisposition, 0, 0, 1) @@ -1142,7 +1208,7 @@ static PHP_METHOD(HttpEnvResponse, setContentDisposition) php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "a", &zdisposition), invalid_arg, return); zend_update_property(Z_OBJCE_P(getThis()), getThis(), ZEND_STRL("contentDisposition"), zdisposition); - RETVAL_ZVAL_FAST(getThis()); + RETVAL_ZVAL(getThis(), 1, 0); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnvResponse_setContentEncoding, 0, 0, 1) @@ -1155,7 +1221,7 @@ static PHP_METHOD(HttpEnvResponse, setContentEncoding) php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "l", &ce), invalid_arg, return); set_option(getThis(), ZEND_STRL("contentEncoding"), IS_LONG, &ce, 0); - RETVAL_ZVAL_FAST(getThis()); + RETVAL_ZVAL(getThis(), 1, 0); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnvResponse_setCacheControl, 0, 0, 1) @@ -1169,7 +1235,7 @@ static PHP_METHOD(HttpEnvResponse, setCacheControl) php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s!", &cc_str, &cc_len), invalid_arg, return); set_option(getThis(), ZEND_STRL("cacheControl"), IS_STRING, cc_str, cc_len); - RETVAL_ZVAL_FAST(getThis()); + RETVAL_ZVAL(getThis(), 1, 0); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnvResponse_setLastModified, 0, 0, 1) @@ -1182,7 +1248,7 @@ static PHP_METHOD(HttpEnvResponse, setLastModified) php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "l", &last_modified), invalid_arg, return); set_option(getThis(), ZEND_STRL("lastModified"), IS_LONG, &last_modified, 0); - RETVAL_ZVAL_FAST(getThis()); + RETVAL_ZVAL(getThis(), 1, 0); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnvResponse_isCachedByLastModified, 0, 0, 0) @@ -1214,7 +1280,7 @@ static PHP_METHOD(HttpEnvResponse, setEtag) php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s!", &etag_str, &etag_len), invalid_arg, return); set_option(getThis(), ZEND_STRL("etag"), IS_STRING, etag_str, etag_len); - RETVAL_ZVAL_FAST(getThis()); + RETVAL_ZVAL(getThis(), 1, 0); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnvResponse_isCachedByEtag, 0, 0, 0) @@ -1225,7 +1291,7 @@ static PHP_METHOD(HttpEnvResponse, isCachedByEtag) char *header_name_str = NULL; size_t header_name_len = 0; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &header_name_str, &header_name_len)) { + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|s!", &header_name_str, &header_name_len)) { if (!header_name_str || !header_name_len) { header_name_str = "If-None-Match"; header_name_len = lenof("If-None-Match"); @@ -1247,7 +1313,7 @@ static PHP_METHOD(HttpEnvResponse, setThrottleRate) set_option(getThis(), ZEND_STRL("throttleDelay"), IS_DOUBLE, &delay, 0); set_option(getThis(), ZEND_STRL("throttleChunk"), IS_LONG, &chunk_size, 0); - RETVAL_ZVAL_FAST(getThis()); + RETVAL_ZVAL(getThis(), 1, 0); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnvResponse_setCookie, 0, 0, 1) @@ -1273,7 +1339,7 @@ static PHP_METHOD(HttpEnvResponse, setCookie) case IS_ARRAY: list = php_http_cookie_list_from_struct(NULL, zcookie_new); zcookie_new = &tmp; - ZVAL_OBJECT(zcookie_new, &php_http_cookie_object_new_ex(php_http_cookie_class_entry, list)->zo, 1); + ZVAL_OBJECT(zcookie_new, &php_http_cookie_object_new_ex(php_http_cookie_class_entry, list)->zo, 0); break; default: @@ -1281,14 +1347,14 @@ static PHP_METHOD(HttpEnvResponse, setCookie) list = php_http_cookie_list_parse(NULL, zs->val, zs->len, 0, NULL); zend_string_release(zs); zcookie_new = &tmp; - ZVAL_OBJECT(zcookie_new, &php_http_cookie_object_new_ex(php_http_cookie_class_entry, list)->zo, 1); + ZVAL_OBJECT(zcookie_new, &php_http_cookie_object_new_ex(php_http_cookie_class_entry, list)->zo, 0); } zend_restore_error_handling(&zeh); set_cookie(getThis(), zcookie_new); zval_ptr_dtor(zcookie_new); - RETVAL_ZVAL_FAST(getThis()); + RETVAL_ZVAL(getThis(), 1, 0); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnvResponse_send, 0, 0, 0)