- added http_get_request_body()

[m6w6/ext-http] / http_api.c

diff --git a/http_api.c b/http_api.c
index 48e3c3151b4f6a9b5d130f2b0c3238e92f29de3e..d943b0df01e3d6afbdae98a407c79267e48a530f 100644 (file)
--- a/http_api.c
+++ b/http_api.c
@@ -24,6 +24,8 @@
 #include "php.h"
 #include "ext/standard/url.h"
 
+#include "SAPI.h"
+
 #include "php_http.h"
 #include "php_http_std_defs.h"
 #include "php_http_api.h"
@@ -41,13 +43,14 @@ ZEND_EXTERN_MODULE_GLOBALS(http);
 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] == '_')) {
@@ -225,6 +228,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,