X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_message.c;h=388c0ad7e5c4a750a38abdaad0ca20691ef9a936;hp=3ea40e1d43deb311f7880591713b86cf4609ddb6;hb=4c7a60297b3aaae7edd8337144a83039c9633d71;hpb=d66d852d90e600cbb850f238c3eb5cdad96b7ad8

diff --git a/src/php_http_message.c b/src/php_http_message.c
index 3ea40e1..388c0ad 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);
@@ -605,7 +605,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) {
@@ -1286,17 +1286,27 @@ 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;
+		zval *header, *cpy = php_http_header_value_to_string(zvalue TSRMLS_CC);
 
 		PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
 
-		Z_ADDREF_P(zvalue);
-		if ((header = php_http_message_header(obj->message, name, name_len, 0))) {
+		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), &zvalue, sizeof(void *), NULL);
+			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, &zvalue, sizeof(void *), NULL);
+			zend_symtable_update(&obj->message->hdrs, name, name_len + 1, &cpy, sizeof(void *), NULL);
 		}
 		efree(name);
 	}
@@ -1637,7 +1647,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)) {