X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_api.c;h=3dcaff04253ee05591209d12c72c2d04a3ac54e7;hb=8b0cff922b0538f98364943291ce0359c3da6d88;hp=48e3c3151b4f6a9b5d130f2b0c3238e92f29de3e;hpb=dac9fc69ba6208b3a150ad447c0ede3b786a83c5;p=m6w6%2Fext-http

diff --git a/http_api.c b/http_api.c
index 48e3c31..3dcaff0 100644
--- 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,19 +34,22 @@
 #	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) */
 char *_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool xhyphen)
 {
 	if (key && key_len) {
-		unsigned i, wasalpha;
-		if (wasalpha = isalpha(key[0])) {
-			key[0] = uctitle ? toupper(key[0]) : tolower(key[0]);
+		size_t i;
+		int wasalpha;
+		if (wasalpha = isalpha((int) key[0])) {
+			key[0] = (char) (uctitle ? toupper((int) key[0]) : tolower((int) key[0]));
 		}
 		for (i = 1; i < key_len; i++) {
-			if (isalpha(key[i])) {
-				key[i] = ((!wasalpha) && uctitle) ? toupper(key[i]) : tolower(key[i]);
+			if (isalpha((int) key[i])) {
+				key[i] = (char) (((!wasalpha) && uctitle) ? toupper((int) key[i]) : tolower((int) key[i]));
 				wasalpha = 1;
 			} else {
 				if (xhyphen && (key[i] == '_')) {
@@ -89,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); \
 	}
@@ -118,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 {
@@ -150,7 +152,6 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
 		efree(keydup);
 	} while (!done);
 
-list_done:
 	return SUCCESS;
 }
 
@@ -225,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,