X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_message.c;h=60569b8be62f336f2199ba72196c6fe1f8178e03;hp=2b3090a0509ce4f1ccc861afdedb8d9d9a802678;hb=76b679d046ac10c00eb13da217f2adaaad580251;hpb=5d8c2bda1c13b12372af844395471cd614c572f1 diff --git a/src/php_http_message.c b/src/php_http_message.c index 2b3090a..60569b8 100644 --- a/src/php_http_message.c +++ b/src/php_http_message.c @@ -69,7 +69,7 @@ php_http_message_t *php_http_message_init_env(php_http_message_t *message, php_h message->http.info.request.method = estrdup(Z_STRVAL_P(sval)); } if ((sval = php_http_env_get_server_var(ZEND_STRL("REQUEST_URI"), 1 TSRMLS_CC))) { - message->http.info.request.url = php_http_url_parse(Z_STRVAL_P(sval), Z_STRLEN_P(sval), ~0 TSRMLS_CC); + message->http.info.request.url = php_http_url_parse(Z_STRVAL_P(sval), Z_STRLEN_P(sval), PHP_HTTP_URL_STDFLAGS TSRMLS_CC); } php_http_env_get_request_headers(&message->hdrs TSRMLS_CC); @@ -358,25 +358,15 @@ void php_http_message_update_headers(php_http_message_t *msg) static void message_headers(php_http_message_t *msg, php_http_buffer_t *str) { char *tmp = NULL; + size_t len = 0; TSRMLS_FETCH_FROM_CTX(msg->ts); - switch (msg->type) { - case PHP_HTTP_REQUEST: - php_http_buffer_appendf(str, PHP_HTTP_INFO_REQUEST_FMT_ARGS(&msg->http, tmp, PHP_HTTP_CRLF)); - PTR_FREE(tmp); - break; - - case PHP_HTTP_RESPONSE: - php_http_buffer_appendf(str, PHP_HTTP_INFO_RESPONSE_FMT_ARGS(&msg->http, tmp, PHP_HTTP_CRLF)); - PTR_FREE(tmp); - break; - - default: - break; - } - + php_http_info_to_string((php_http_info_t *) msg, &tmp, &len, PHP_HTTP_CRLF TSRMLS_CC); php_http_message_update_headers(msg); + + php_http_buffer_append(str, tmp, len); php_http_header_to_string(str, &msg->hdrs TSRMLS_CC); + STR_FREE(tmp); } void php_http_message_to_callback(php_http_message_t *msg, php_http_pass_callback_t cb, void *cb_arg) @@ -605,7 +595,7 @@ static void php_http_message_object_prophandler_get_request_url(php_http_message } static void php_http_message_object_prophandler_set_request_url(php_http_message_object_t *obj, zval *value TSRMLS_DC) { if (PHP_HTTP_MESSAGE_TYPE(REQUEST, obj->message)) { - PTR_SET(obj->message->http.info.request.url, php_http_url_from_zval(value, ~0 TSRMLS_CC)); + PTR_SET(obj->message->http.info.request.url, php_http_url_from_zval(value, PHP_HTTP_URL_STDFLAGS TSRMLS_CC)); } } static void php_http_message_object_prophandler_get_response_status(php_http_message_object_t *obj, zval *return_value TSRMLS_DC) { @@ -1273,6 +1263,38 @@ static PHP_METHOD(HttpMessage, setHeaders) RETVAL_ZVAL(getThis(), 1, 0); } +static inline void php_http_message_object_add_header(php_http_message_object_t *obj, const char *name_str, size_t name_len, zval *zvalue TSRMLS_DC) +{ + char *name = php_http_pretty_key(estrndup(name_str, name_len), name_len, 1, 1); + zval *header, *cpy; + + if (Z_TYPE_P(zvalue) == IS_NULL) { + return; + } + + cpy = php_http_header_value_to_string(zvalue TSRMLS_CC); + + if ((name_len != lenof("Set-Cookie") && strcmp(name, "Set-Cookie")) + && (header = php_http_message_header(obj->message, name, name_len, 1))) { + zval *tmp; + char *hdr_str; + size_t hdr_len = spprintf(&hdr_str, 0, "%s, %s", Z_STRVAL_P(header), Z_STRVAL_P(cpy)); + + MAKE_STD_ZVAL(tmp); + ZVAL_STRINGL(tmp, hdr_str, hdr_len, 0); + zend_symtable_update(&obj->message->hdrs, name, name_len + 1, &tmp, sizeof(void *), NULL); + zval_ptr_dtor(&header); + zval_ptr_dtor(&cpy); + } else if ((header = php_http_message_header(obj->message, name, name_len, 0))) { + convert_to_array(header); + zend_hash_next_index_insert(Z_ARRVAL_P(header), &cpy, sizeof(void *), NULL); + zval_ptr_dtor(&header); + } else { + zend_symtable_update(&obj->message->hdrs, name, name_len + 1, &cpy, sizeof(void *), NULL); + } + efree(name); +} + ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_addHeader, 0, 0, 2) ZEND_ARG_INFO(0, header) ZEND_ARG_INFO(0, value) @@ -1285,30 +1307,10 @@ static PHP_METHOD(HttpMessage, addHeader) if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz", &name_str, &name_len, &zvalue)) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - char *name = php_http_pretty_key(estrndup(name_str, name_len), name_len, 1, 1); - zval *header, *cpy = php_http_header_value_to_string(zvalue TSRMLS_CC); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); - if ((name_len != lenof("Set-Cookie") && strcmp(name, "Set-Cookie")) - && (header = php_http_message_header(obj->message, name, name_len, 1))) { - zval *tmp; - char *hdr_str; - size_t hdr_len = spprintf(&hdr_str, 0, "%s, %s", Z_STRVAL_P(header), Z_STRVAL_P(cpy)); - - MAKE_STD_ZVAL(tmp); - ZVAL_STRINGL(tmp, hdr_str, hdr_len, 0); - zend_symtable_update(&obj->message->hdrs, name, name_len + 1, &tmp, sizeof(void *), NULL); - zval_ptr_dtor(&header); - zval_ptr_dtor(&cpy); - } else if ((header = php_http_message_header(obj->message, name, name_len, 0))) { - convert_to_array(header); - zend_hash_next_index_insert(Z_ARRVAL_P(header), &cpy, sizeof(void *), NULL); - zval_ptr_dtor(&header); - } else { - zend_symtable_update(&obj->message->hdrs, name, name_len + 1, &cpy, sizeof(void *), NULL); - } - efree(name); + php_http_message_object_add_header(obj, name_str, name_len, zvalue TSRMLS_CC); } RETVAL_ZVAL(getThis(), 1, 0); } @@ -1327,7 +1329,19 @@ static PHP_METHOD(HttpMessage, addHeaders) PHP_HTTP_MESSAGE_OBJECT_INIT(obj); - array_join(Z_ARRVAL_P(new_headers), &obj->message->hdrs, append, ARRAY_JOIN_STRONLY|ARRAY_JOIN_PRETTIFY); + if (append) { + HashPosition pos; + php_http_array_hashkey_t key = php_http_array_hashkey_init(0); + zval **val; + + FOREACH_KEYVAL(pos, new_headers, key, val) { + php_http_array_hashkey_stringify(&key); + php_http_message_object_add_header(obj, key.str, key.len-1, *val TSRMLS_CC); + php_http_array_hashkey_stringfree(&key); + } + } else { + array_join(Z_ARRVAL_P(new_headers), &obj->message->hdrs, 0, ARRAY_JOIN_PRETTIFY|ARRAY_JOIN_STRONLY); + } } RETVAL_ZVAL(getThis(), 1, 0); } @@ -1367,24 +1381,13 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpMessage, getInfo) { if (SUCCESS == zend_parse_parameters_none()) { - char *tmp = NULL; + size_t len = 0; php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); - switch (obj->message->type) { - case PHP_HTTP_REQUEST: - Z_STRLEN_P(return_value) = spprintf(&Z_STRVAL_P(return_value), 0, PHP_HTTP_INFO_REQUEST_FMT_ARGS(&obj->message->http, tmp, "")); - PTR_FREE(tmp); - break; - case PHP_HTTP_RESPONSE: - Z_STRLEN_P(return_value) = spprintf(&Z_STRVAL_P(return_value), 0, PHP_HTTP_INFO_RESPONSE_FMT_ARGS(&obj->message->http, tmp, "")); - PTR_FREE(tmp); - break; - default: - RETURN_NULL(); - break; - } + php_http_info_to_string((php_http_info_t *) obj->message, &Z_STRVAL_P(return_value), &len, "" TSRMLS_CC); + Z_STRLEN_P(return_value) = len; Z_TYPE_P(return_value) = IS_STRING; return; } @@ -1647,7 +1650,7 @@ static PHP_METHOD(HttpMessage, setRequestUrl) } zend_replace_error_handling(EH_THROW, php_http_exception_bad_url_class_entry, &zeh TSRMLS_CC); - url = php_http_url_from_zval(zurl, ~0 TSRMLS_CC); + url = php_http_url_from_zval(zurl, PHP_HTTP_URL_STDFLAGS TSRMLS_CC); zend_restore_error_handling(&zeh TSRMLS_CC); if (url && php_http_url_is_empty(url)) {