separate http_env_request; add getQuer(), getPost(), getFiles()

[m6w6/ext-http] / php_http_message.c

diff --git a/php_http_message.c b/php_http_message.c
index ead53476ebed117277e8fc0a842ddb2a10e8b91d..0322a4a1acf76fc6d196a5c0bbdb42398863e2e0 100644 (file)
--- a/php_http_message.c
+++ b/php_http_message.c
@@ -17,13 +17,15 @@ PHP_HTTP_API zend_bool php_http_message_info_callback(php_http_message_t **messa
        php_http_message_t *old = *message;
 
        /* advance message */
-       if (old->type || zend_hash_num_elements(&old->hdrs) || PHP_HTTP_BUFFER_LEN(old)) {
+       if (!old || old->type || zend_hash_num_elements(&old->hdrs) || PHP_HTTP_BUFFER_LEN(old)) {
                (*message) = php_http_message_init(NULL, 0 TSRMLS_CC);
                (*message)->parent = old;
                (*headers) = &((*message)->hdrs);
        }
 
-       php_http_message_set_info(*message, info);
+       if (info) {
+               php_http_message_set_info(*message, info);
+       }
 
        return old != *message;
 }
@@ -65,6 +67,14 @@ PHP_HTTP_API php_http_message_t *php_http_message_init_env(php_http_message_t *m
                        if ((sval = php_http_env_get_server_var(ZEND_STRL("REQUEST_URI"), 1 TSRMLS_CC))) {
                                message->http.info.request.url = estrdup(Z_STRVAL_P(sval));
                        }
+                       if ((sval = php_http_env_get_server_var(ZEND_STRL("CONTENT_TYPE"), 1 TSRMLS_CC))) {
+                               Z_ADDREF_P(sval);
+                               zend_hash_update(&message->hdrs, "Content-Type", sizeof("Content-Type"), (void *) &sval, sizeof(zval *), NULL);
+                       }
+                       if ((sval = php_http_env_get_server_var(ZEND_STRL("CONTENT_LENGTH"), 1 TSRMLS_CC))) {
+                               Z_ADDREF_P(sval);
+                               zend_hash_update(&message->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &sval, sizeof(zval *), NULL);
+                       }
                        
                        php_http_env_get_request_headers(&message->hdrs TSRMLS_CC);
 
@@ -124,17 +134,25 @@ PHP_HTTP_API php_http_message_t *php_http_message_parse(php_http_message_t *msg,
 {
        php_http_message_parser_t p;
        php_http_buffer_t buf;
+       int free_msg;
 
-       if (!msg) {
-               msg = php_http_message_init(NULL, 0 TSRMLS_CC);
-       }
        php_http_buffer_from_string_ex(&buf, str, len);
        php_http_message_parser_init(&p TSRMLS_CC);
-       php_http_message_parser_parse(&p, &buf, PHP_HTTP_MESSAGE_PARSER_CLEANUP, &msg);
+
+       if ((free_msg = !msg)) {
+               msg = php_http_message_init(NULL, 0 TSRMLS_CC);
+       }
+
+       if (FAILURE == php_http_message_parser_parse(&p, &buf, PHP_HTTP_MESSAGE_PARSER_CLEANUP, &msg)) {
+               if (free_msg) {
+                       php_http_message_free(&msg);
+               }
+               msg = NULL;
+       }
+
        php_http_message_parser_dtor(&p);
        php_http_buffer_dtor(&buf);
 
-       /* FIXME */
        return msg;
 }
 
@@ -161,7 +179,8 @@ PHP_HTTP_API zval *php_http_message_header(php_http_message_t *msg, char *key_st
                        ZVAL_STRINGL(header_str, PHP_HTTP_BUFFER_VAL(&str), PHP_HTTP_BUFFER_LEN(&str), 0);
                        ret = header_str;
                } else {
-                       ret = php_http_ztyp(IS_STRING, *header);
+                       Z_ADDREF_PP(header);
+                       ret = *header;
                }
        }
 
@@ -178,7 +197,7 @@ PHP_HTTP_API void php_http_message_set_type(php_http_message_t *message, php_htt
        if (type != message->type) {
 
                /* free request info */
-               switch (message->type = type) {
+               switch (message->type) {
                        case PHP_HTTP_REQUEST:
                                STR_FREE(message->http.info.request.method);
                                STR_FREE(message->http.info.request.url);
@@ -192,6 +211,7 @@ PHP_HTTP_API void php_http_message_set_type(php_http_message_t *message, php_htt
                                break;
                }
 
+               message->type = type;
                memset(&message->http, 0, sizeof(message->http));
        }
 }
@@ -583,7 +603,7 @@ PHP_HTTP_API php_http_message_t *php_http_message_copy_ex(php_http_message_t *fr
                        temp->parent = php_http_message_init(NULL, 0 TSRMLS_CC);
                        php_http_message_set_info(temp->parent, &info);
                        zend_hash_copy(&temp->parent->hdrs, &from->parent->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
-                       php_http_message_body_copy(&from->body, &temp->body, 1);
+                       php_http_message_body_copy(&from->parent->body, &temp->parent->body, 1);
                
                        temp = temp->parent;
                        from = from->parent;
@@ -1272,24 +1292,36 @@ static HashTable *php_http_message_object_get_props(zval *object TSRMLS_DC)
 
 PHP_METHOD(HttpMessage, __construct)
 {
-       int length = 0;
-       char *message = NULL;
+       zval *zmessage = NULL;
+       php_http_message_t *msg = NULL;
        php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
        with_error_handling(EH_THROW, php_http_exception_class_entry) {
-               if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &message, &length) && message && length) {
-                       php_http_message_t *msg = obj->message;
-
-                       php_http_message_dtor(msg);
-                       with_error_handling(EH_THROW, php_http_exception_class_entry) {
-                               if ((obj->message = php_http_message_parse(msg, message, length TSRMLS_CC))) {
-                                       if (obj->message->parent) {
-                                               obj->parent = php_http_message_object_new_ex(Z_OBJCE_P(getThis()), obj->message->parent, NULL TSRMLS_CC);
-                                       }
-                               } else {
-                                       obj->message = php_http_message_init(msg, 0 TSRMLS_CC);
+               if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z!", &zmessage) && zmessage) {
+                       if (Z_TYPE_P(zmessage) == IS_RESOURCE) {
+                               php_stream *s;
+                               php_http_message_parser_t p;
+
+                               php_stream_from_zval(s, &zmessage);
+                               if (s && php_http_message_parser_init(&p TSRMLS_CC)) {
+                                       php_http_message_parser_parse_stream(&p, s, &msg);
+                                       php_http_message_parser_dtor(&p);
+                               }
+                       } else {
+                               zmessage = php_http_ztyp(IS_STRING, zmessage);
+                               msg = php_http_message_parse(NULL, Z_STRVAL_P(zmessage), Z_STRLEN_P(zmessage) TSRMLS_CC);
+                               zval_ptr_dtor(&zmessage);
+                       }
+
+                       if (msg) {
+                               php_http_message_dtor(obj->message);
+                               obj->message = msg;
+                               if (obj->message->parent) {
+                                       obj->parent = php_http_message_object_new_ex(Z_OBJCE_P(getThis()), obj->message->parent, NULL TSRMLS_CC);
                                }
-                       } end_error_handling();
+                       } else {
+                               php_http_error(HE_THROW, PHP_HTTP_E_MESSAGE, "could not parse message: %.*s", 25, Z_STRVAL_P(zmessage));
+                       }
                }
                if (!obj->message) {
                        obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);