#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_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] == '_')) {
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); \
}
key = val + strlen(val);
HTTP_KEYLIST_FIXVAL();
HTTP_KEYLIST_VAL(&array, "value", val, vallen);
- goto list_done;
+ return SUCCESS;
}
/* additional info appended */
else {
efree(keydup);
} while (!done);
-list_done:
return SUCCESS;
}
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);
}
}
/* }}} */
+/* {{{ 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,
} 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);
}