X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_object.c;h=a8540e78c64bd9db836b1fd9bddbfcc38f7edb12;hp=fe4a628620c622f2fc9c806aff9f91404256ff87;hb=96b6d481cfa03fae8c40a6ab7c2156036b082d7d;hpb=325520da64f5ae1ecea2f7395fc808ade28da9ea 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; }