From: Michael Wallner <mike@php.net>
Date: Tue, 12 Apr 2005 20:29:08 +0000 (+0000)
Subject: - no empty_string anymore
X-Git-Tag: RELEASE_0_8_0~71
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=96b6d481cfa03fae8c40a6ab7c2156036b082d7d;p=m6w6%2Fext-http

- no empty_string anymore
---

diff --git a/http_headers_api.c b/http_headers_api.c
index b9fe7b1..cc4e609 100644
--- a/http_headers_api.c
+++ b/http_headers_api.c
@@ -271,14 +271,14 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(char *header, size_t header_len,
 							Z_ARRVAL(array) = headers;
 						}
 					} else
-				
+
 					/* "header: value" pair */
 					if (colon) {
 
 						/* skip empty key */
 						if (header != colon) {
 							zval **previous = NULL;
-							char *value = empty_string;
+							char *value;
 							int keylen = colon - header;
 							char *key = estrndup(header, keylen);
 
@@ -296,6 +296,7 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(char *header, size_t header_len,
 							if (value_len > 0) {
 								value = estrndup(colon, value_len);
 							} else {
+								value = estrdup("");
 								value_len = 0;
 							}
 
@@ -343,7 +344,7 @@ PHP_HTTP_API void _http_parse_headers_default_callback(void **cb_data, char *htt
 {
 	zval array;
 	Z_ARRVAL(array) = *headers;
-	
+
 	/* response */
 	if (!strncmp(http_line, "HTTP/1.", lenof("HTTP/1."))) {
 		add_assoc_stringl(&array, "Response Status", http_line + lenof("HTTP/1.x "), line_length - lenof("HTTP/1.x \r\n"), 1);
@@ -351,7 +352,7 @@ PHP_HTTP_API void _http_parse_headers_default_callback(void **cb_data, char *htt
 	/* request */
 	if (!strncmp(http_line + line_length - lenof("HTTP/1.x\r\n"), "HTTP/1.", lenof("HTTP/1."))) {
 		char *sep = strchr(http_line, ' ');
-		
+
 		add_assoc_stringl(&array, "Request Method", http_line, sep - http_line, 1);
 		add_assoc_stringl(&array, "Request Uri", sep + 1, strstr(sep, "HTTP/1.") - sep + 1 + 1, 1);
 	}
diff --git a/http_message_object.c b/http_message_object.c
index fe4a628..a8540e7 100644
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -173,7 +173,7 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 				if (msg->len) {
 					RETVAL_STRINGL(msg->raw, msg->len, 1);
 				} else {
-					RETVAL_STRINGL(empty_string, 0, 1);
+					RETVAL_STRINGL("", 0, 1);
 				}
 			} else {
 				RETVAL_NULL();
@@ -327,7 +327,7 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
 		int m_prop_len; \
 		Z_ARRVAL(array) = OBJ_PROP(obj); \
 		zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 1); \
-		add_assoc_stringl_ex(&array, m_prop_name, sizeof(name)+4, val, len, val != empty_string); \
+		add_assoc_stringl_ex(&array, m_prop_name, sizeof(name)+4, val, len, 1); \
 	}
 
 	zend_hash_clean(OBJ_PROP(obj));
@@ -354,16 +354,16 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
 		case HTTP_MSG_RESPONSE:
 			ASSOC_PROP(obj, double, "httpVersion", msg->info.response.http_version);
 			ASSOC_PROP(obj, long, "responseCode", msg->info.response.code);
-			ASSOC_STRING(obj, "requestMethod", empty_string);
-			ASSOC_STRING(obj, "requestUri", empty_string);
+			ASSOC_STRING(obj, "requestMethod", "");
+			ASSOC_STRING(obj, "requestUri", "");
 		break;
 
 		case HTTP_MSG_NONE:
 		default:
 			ASSOC_PROP(obj, double, "httpVersion", 0.0);
 			ASSOC_PROP(obj, long, "responseCode", 0);
-			ASSOC_STRING(obj, "requestMethod", empty_string);
-			ASSOC_STRING(obj, "requestUri", empty_string);
+			ASSOC_STRING(obj, "requestMethod", "");
+			ASSOC_STRING(obj, "requestUri", "");
 		break;
 	}