- flush

[m6w6/ext-http] / http_api.c

diff --git a/http_api.c b/http_api.c
index 5bf39207c4ee7ce10630ddc1f8452c5cc9902679..3dcaff04253ee05591209d12c72c2d04a3ac54e7 100644 (file)
--- a/http_api.c
+++ b/http_api.c
@@ -18,10 +18,9 @@
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
 #endif
-
-#include <ctype.h>
-
 #include "php.h"
+
+#include "SAPI.h"
 #include "ext/standard/url.h"
 
 #include "php_http.h"
@@ -35,6 +34,8 @@
 #      include "php_http_exception_object.h"
 #endif
 
+#include <ctype.h>
+
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
 /* char *pretty_key(char *, size_t, zend_bool, zebd_bool) */
@@ -90,8 +91,8 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
                if (decode) { \
                        decode(str, len, &decoded, &decoded_len TSRMLS_CC); \
                } else { \
-                       decoded = estrdup(str); \
                        decoded_len = len; \
+                       decoded = estrndup(str, decoded_len); \
                } \
                add_assoc_stringl(array, k, decoded, decoded_len, 0); \
        }
@@ -119,7 +120,7 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
                        key = val + strlen(val);
                        HTTP_KEYLIST_FIXVAL();
                        HTTP_KEYLIST_VAL(&array, "value", val, vallen);
-                       goto list_done;
+                       return SUCCESS;
                }
                /* additional info appended */
                else {
@@ -151,7 +152,6 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
                efree(keydup);
        } while (!done);
 
-list_done:
        return SUCCESS;
 }
 
@@ -226,6 +226,20 @@ PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_size, zen
 }
 /* }}} */
 
+/* {{{ zend_bool http_get_request_body(char **, size_t *) */
+PHP_HTTP_API STATUS _http_get_request_body_ex(char **body, size_t *length, zend_bool dup TSRMLS_DC)
+{
+       *length = 0;
+       *body = NULL;
+
+       if (SG(request_info).raw_post_data) {
+               *length = SG(request_info).raw_post_data_length;
+               *body = (char *) (dup ? estrndup(SG(request_info).raw_post_data, *length) : SG(request_info).raw_post_data);
+               return SUCCESS;
+       }
+       return FAILURE;
+}
+/* }}} */
 
 /* {{{ char *http_chunked_decode(char *, size_t, char **, size_t *) */
 PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encoded_len,