X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=8e683a1f31e1a201c03a63cd2d6e921a60351b10;hp=9c587c899df0752e644c40ad53a687931a6d1d97;hb=a8230e38566547ed14c101bbf026904acdf0d458;hpb=e32f6fed32939bba9839c0e4f7cdaec02d8828dd

diff --git a/http_api.c b/http_api.c
index 9c587c8..8e683a1 100644
--- a/http_api.c
+++ b/http_api.c
@@ -18,11 +18,11 @@
 #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"
 #include "php_http_std_defs.h"
 #include "php_http_api.h"
@@ -34,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] == '_')) {
@@ -88,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); \
 	}
@@ -108,7 +111,7 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
 	}
 
 	HTTP_KEYLIST_FIXKEY();
-	
+
 	if (first_entry_is_name_value_pair) {
 		HTTP_KEYLIST_VAL(&array, "name", key, keylen);
 
@@ -117,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 {
@@ -149,7 +152,6 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
 		efree(keydup);
 	} while (!done);
 
-list_done:
 	return SUCCESS;
 }
 
@@ -180,7 +182,7 @@ void _http_error_ex(long type, long code, const char *format, ...)
 STATUS _http_exit_ex(int status, char *header, zend_bool free_header TSRMLS_DC)
 {
 	if (SUCCESS != http_send_status_header(status, header)) {
-		http_error_ex(E_WARNING, HTTP_E_HEADER, "Failed to exit with status/header: %d - %s", status, header ? header : "");
+		http_error_ex(HE_WARNING, HTTP_E_HEADER, "Failed to exit with status/header: %d - %s", status, header ? header : "");
 		if (free_header && header) {
 			efree(header);
 		}
@@ -224,6 +226,20 @@ PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_size, zen
 }
 /* }}} */
 
+/* {{{ STATUS 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,
@@ -257,10 +273,10 @@ PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encode
 			} else {
 				efree(*decoded);
 				if (no_crlf) {
-					http_error_ex(E_WARNING, HTTP_E_PARSE, "Invalid character (expected 0x0D 0x0A; got: 0x%x 0x%x)", *n_ptr, *(n_ptr + 1));
+					http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid character (expected 0x0D 0x0A; got: 0x%x 0x%x)", *n_ptr, *(n_ptr + 1));
 				} else {
 					char *error = estrndup(n_ptr, strcspn(n_ptr, "\r\n \0"));
-					http_error_ex(E_WARNING, HTTP_E_PARSE, "Invalid chunk size: '%s' at pos %d", error, n_ptr - encoded);
+					http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid chunk size: '%s' at pos %d", error, n_ptr - encoded);
 					efree(error);
 				}
 
@@ -285,19 +301,8 @@ PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encode
 }
 /* }}} */
 
-/* {{{ STATUS http_split_response(zval *, zval *, zval *) */
-PHP_HTTP_API STATUS _http_split_response(zval *response, zval *headers, zval *body TSRMLS_DC)
-{
-	char *b = NULL;
-	size_t l = 0;
-	STATUS status = http_split_response_ex(Z_STRVAL_P(response), Z_STRLEN_P(response), Z_ARRVAL_P(headers), &b, &l);
-	ZVAL_STRINGL(body, b, l, 0);
-	return status;
-}
-/* }}} */
-
 /* {{{ STATUS http_split_response(char *, size_t, HashTable *, char **, size_t *) */
-PHP_HTTP_API STATUS _http_split_response_ex(char *response, size_t response_len,
+PHP_HTTP_API STATUS _http_split_response(char *response, size_t response_len,
 	HashTable *headers, char **body, size_t *body_len TSRMLS_DC)
 {
 	char *header = response, *real_body = NULL;