- separated http_check_method() from http_check_allowed_methods()

[m6w6/ext-http] / http_message_object.c

diff --git a/http_message_object.c b/http_message_object.c
index 2e968b808b600f3632c89873ad9921ec8d8048e9..ffb319809ba6a1752b54b385d82a390e06be709b 100644 (file)
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -43,6 +43,24 @@ zend_function_entry http_message_object_fe[] = {
        PHP_ME(HttpMessage, setRaw, NULL, ZEND_ACC_PUBLIC)
        PHP_ME(HttpMessage, getBody, NULL, ZEND_ACC_PUBLIC)
        PHP_ME(HttpMessage, getHeaders, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HttpMessage, setHeaders, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HttpMessage, addHeaders, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HttpMessage, getType, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HttpMessage, setType, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HttpMessage, getResponseCode, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HttpMessage, setResponseCode, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HttpMessage, getRequestMethod, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HttpMessage, setRequestMethod, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HttpMessage, getRequestUri, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HttpMessage, setRequestUri, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HttpMessage, getHttpVersion, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HttpMessage, setHttpVersion, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HttpMessage, getNestedMessage, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HttpMessage, toString, NULL, ZEND_ACC_PUBLIC)
+
+       ZEND_MALIAS(HttpMessage, __toString, toString, NULL, ZEND_ACC_PUBLIC)
+
+       PHP_ME(HttpMessage, fromString, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
        {NULL, NULL, NULL}
 };
 static zend_object_handlers http_message_object_handlers;
@@ -51,19 +69,28 @@ void _http_message_object_init(INIT_FUNC_ARGS)
 {
        HTTP_REGISTER_CLASS_EX(HttpMessage, http_message_object, NULL, 0);
 
+       HTTP_LONG_CONSTANT("HTTP_MSG_NONE", HTTP_MSG_NONE);
+       HTTP_LONG_CONSTANT("HTTP_MSG_REQUEST", HTTP_MSG_REQUEST);
+       HTTP_LONG_CONSTANT("HTTP_MSG_RESPONSE", HTTP_MSG_RESPONSE);
+
        http_message_object_handlers.read_property = http_message_object_read_prop;
        http_message_object_handlers.write_property = http_message_object_write_prop;
        http_message_object_handlers.get_properties = http_message_object_get_props;
 }
 
 zend_object_value _http_message_object_new(zend_class_entry *ce TSRMLS_DC)
+{
+       return http_message_object_new_ex(ce, NULL);
+}
+
+zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message *msg TSRMLS_DC)
 {
        zend_object_value ov;
        http_message_object *o;
 
        o = ecalloc(1, sizeof(http_message_object));
        o->zo.ce = ce;
-       o->message = http_message_new();
+       o->message = msg ? msg : http_message_new();
 
        ALLOC_HASHTABLE(OBJ_PROP(o));
        zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
@@ -80,12 +107,11 @@ static inline void _http_message_object_declare_default_properties(TSRMLS_D)
 
        DCL_PROP(PROTECTED, long, type, HTTP_MSG_NONE);
 
-       DCL_PROP(PROTECTED, string, raw, "");
        DCL_PROP(PROTECTED, string, body, "");
 
        DCL_PROP(PROTECTED, string, requestMethod, "");
        DCL_PROP(PROTECTED, string, requestUri, "");
-       DCL_PROP(PROTECTED, long, responseStatus, 0);
+       DCL_PROP(PROTECTED, long, responseCode, 0);
 
        DCL_PROP_N(PROTECTED, httpVersion);
        DCL_PROP_N(PROTECTED, headers);
@@ -118,7 +144,7 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
                return EG(uninitialized_zval_ptr);
        }
 
-    zval_dtor(return_value);
+    zval_ptr_dtor(&return_value);
 
 #if 0
        fprintf(stderr, "Reading property: %s(%d==%d) (%lu)\n", Z_STRVAL_P(member), Z_STRLEN_P(member), strlen(Z_STRVAL_P(member)),
@@ -149,18 +175,6 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
                        }
                break;
 
-               case HTTP_MSG_PROPHASH_RAW:
-                       if (msg->raw) {
-                               if (msg->len) {
-                                       RETVAL_STRINGL(msg->raw, msg->len, 1);
-                               } else {
-                                       RETVAL_STRINGL(empty_string, 0, 1);
-                               }
-                       } else {
-                               RETVAL_NULL();
-                       }
-               break;
-
                case HTTP_MSG_PROPHASH_BODY:
                        phpstr_fix(PHPSTR(msg));
                        RETVAL_PHPSTR(PHPSTR(msg), 0, 1);
@@ -172,7 +186,12 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
                break;
 
                case HTTP_MSG_PROPHASH_NESTED_MESSAGE:
-                       RETVAL_NULL();
+                       if (msg->nested) {
+                               Z_TYPE_P(return_value) = IS_OBJECT;
+                               return_value->value.obj = http_message_object_from_msg(msg->nested);
+                       } else {
+                               RETVAL_NULL();
+                       }
                break;
 
                case HTTP_MSG_PROPHASH_REQUEST_METHOD:
@@ -191,9 +210,9 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
                        }
                break;
 
-               case HTTP_MSG_PROPHASH_RESPONSE_STATUS:
+               case HTTP_MSG_PROPHASH_RESPONSE_CODE:
                        if (msg->type == HTTP_MSG_RESPONSE) {
-                               RETVAL_LONG(msg->info.response.status);
+                               RETVAL_LONG(msg->info.response.code);
                        } else {
                                RETVAL_NULL();
                        }
@@ -225,7 +244,22 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
        switch (zend_get_hash_value(Z_STRVAL_P(member), strlen(Z_STRVAL_P(member)) + 1))
        {
                case HTTP_MSG_PROPHASH_TYPE:
-                       msg->type = Z_LVAL_P(value);
+                       if (Z_LVAL_P(value) != msg->type) {
+                               if (msg->type == HTTP_MSG_REQUEST) {
+                                       if (msg->info.request.method) {
+                                               efree(msg->info.request.method);
+                                       }
+                                       if (msg->info.request.URI) {
+                                               efree(msg->info.request.URI);
+                                       }
+                               }
+                               msg->type = Z_LVAL_P(value);
+                               if (msg->type == HTTP_MSG_REQUEST) {
+                                       msg->info.request.method = NULL;
+                                       msg->info.request.URI = NULL;
+                               }
+                       }
+
                break;
 
                case HTTP_MSG_PROPHASH_HTTP_VERSION:
@@ -241,11 +275,6 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
                        }
                break;
 
-               case HTTP_MSG_PROPHASH_RAW:
-                       http_message_dtor(msg);
-                       http_message_parse_ex(msg, Z_STRVAL_P(value), Z_STRLEN_P(value), 1);
-               break;
-
                case HTTP_MSG_PROPHASH_BODY:
                        phpstr_dtor(PHPSTR(msg));
                        phpstr_from_string_ex(PHPSTR(msg), Z_STRVAL_P(value), Z_STRLEN_P(value));
@@ -277,12 +306,14 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
                        }
                break;
 
-               case HTTP_MSG_PROPHASH_RESPONSE_STATUS:
+               case HTTP_MSG_PROPHASH_RESPONSE_CODE:
                        if (msg->type == HTTP_MSG_RESPONSE) {
-                               msg->info.response.status = Z_LVAL_P(value);
+                               msg->info.response.code = Z_LVAL_P(value);
                        }
                break;
        }
+       zval_dtor(value);
+       FREE_ZVAL(value);
 }
 
 static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
@@ -308,13 +339,12 @@ 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));
 
        ASSOC_PROP(obj, long, "type", msg->type);
-       ASSOC_STRINGL(obj, "raw", msg->raw, msg->len)
        ASSOC_STRINGL(obj, "body", PHPSTR_VAL(msg), PHPSTR_LEN(msg));
 
        MAKE_STD_ZVAL(headers);
@@ -327,24 +357,24 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
        {
                case HTTP_MSG_REQUEST:
                        ASSOC_PROP(obj, double, "httpVersion", msg->info.request.http_version);
-                       ASSOC_PROP(obj, long, "responseStatus", 0);
+                       ASSOC_PROP(obj, long, "responseCode", 0);
                        ASSOC_STRING(obj, "requestMethod", msg->info.request.method);
                        ASSOC_STRING(obj, "requestUri", msg->info.request.URI);
                break;
 
                case HTTP_MSG_RESPONSE:
                        ASSOC_PROP(obj, double, "httpVersion", msg->info.response.http_version);
-                       ASSOC_PROP(obj, long, "responseStatus", msg->info.response.status);
-                       ASSOC_STRING(obj, "requestMethod", empty_string);
-                       ASSOC_STRING(obj, "requestUri", empty_string);
+                       ASSOC_PROP(obj, long, "responseCode", msg->info.response.code);
+                       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, "responseStatus", 0);
-                       ASSOC_STRING(obj, "requestMethod", empty_string);
-                       ASSOC_STRING(obj, "requestUri", empty_string);
+                       ASSOC_PROP(obj, long, "responseCode", 0);
+                       ASSOC_STRING(obj, "requestMethod", "");
+                       ASSOC_STRING(obj, "requestUri", "");
                break;
        }