projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- no user debug callbacks any longer
[m6w6/ext-http]
/
http_api.c
diff --git
a/http_api.c
b/http_api.c
index d943b0df01e3d6afbdae98a407c79267e48a530f..e54974f9cb9c10d8e45fe20081e1d55db2d00899 100644
(file)
--- a/
http_api.c
+++ b/
http_api.c
@@
-18,13
+18,10
@@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-
-#include <ctype.h>
-
#include "php.h"
#include "php.h"
-#include "ext/standard/url.h"
#include "SAPI.h"
#include "SAPI.h"
+#include "ext/standard/url.h"
#include "php_http.h"
#include "php_http_std_defs.h"
#include "php_http.h"
#include "php_http_std_defs.h"
@@
-37,6
+34,8
@@
# include "php_http_exception_object.h"
#endif
# 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) */
ZEND_EXTERN_MODULE_GLOBALS(http);
/* char *pretty_key(char *, size_t, zend_bool, zebd_bool) */
@@
-92,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 { \
if (decode) { \
decode(str, len, &decoded, &decoded_len TSRMLS_CC); \
} else { \
- decoded = estrdup(str); \
decoded_len = len; \
decoded_len = len; \
+ decoded = estrndup(str, decoded_len); \
} \
add_assoc_stringl(array, k, decoded, decoded_len, 0); \
}
} \
add_assoc_stringl(array, k, decoded, decoded_len, 0); \
}
@@
-121,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);
key = val + strlen(val);
HTTP_KEYLIST_FIXVAL();
HTTP_KEYLIST_VAL(&array, "value", val, vallen);
-
goto list_done
;
+
return SUCCESS
;
}
/* additional info appended */
else {
}
/* additional info appended */
else {
@@
-153,7
+152,6
@@
STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
efree(keydup);
} while (!done);
efree(keydup);
} while (!done);
-list_done:
return SUCCESS;
}
return SUCCESS;
}
@@
-228,7
+226,7
@@
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 *) */
+/* {{{
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;
PHP_HTTP_API STATUS _http_get_request_body_ex(char **body, size_t *length, zend_bool dup TSRMLS_DC)
{
*length = 0;