#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include "php.h"
+#define HTTP_WANT_CURL
#include "php_http.h"
-#include "php_http_std_defs.h"
+
#include "php_http_api.h"
+#include "php_http_request_api.h"
#include "php_http_request_method_api.h"
-#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
+
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) && !defined(WONKY)
# include "php_http_request_object.h"
#endif
-#include "missing.h"
-#include "phpstr/phpstr.h"
-
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
/* {{{ char *http_request_methods[] */
static const char *const http_request_methods[] = {
"UNKNOWN",
}
/* }}} */
-/* {{{ unsigned long http_request_method_exists(zend_bool, unsigned long, char *) */
-PHP_HTTP_API unsigned long _http_request_method_exists(zend_bool by_name, unsigned long id, const char *name TSRMLS_DC)
+/* {{{ ulong http_request_method_exists(zend_bool, ulong, char *) */
+PHP_HTTP_API ulong _http_request_method_exists(zend_bool by_name, ulong id, const char *name TSRMLS_DC)
{
if (by_name) {
unsigned i;
zval **data;
char *key;
ulong idx;
+ HashPosition pos;
- FOREACH_HASH_KEYVAL(&HTTP_G(request).methods.custom, key, idx, data) {
+ FOREACH_HASH_KEYVAL(pos, &HTTP_G(request).methods.custom, key, idx, data) {
if (!strcmp(name, Z_STRVAL_PP(data))) {
return idx + HTTP_MAX_REQUEST_METHOD;
}
}
/* }}} */
-/* {{{ unsigned long http_request_method_register(char *) */
-PHP_HTTP_API unsigned long _http_request_method_register(const char *method_name, size_t method_name_len TSRMLS_DC)
+/* {{{ ulong http_request_method_register(char *) */
+PHP_HTTP_API ulong _http_request_method_register(const char *method_name, size_t method_name_len TSRMLS_DC)
{
zval array;
char *http_method, *method;
- unsigned long i, meth_num = HTTP_G(request).methods.custom.nNextFreeElement + HTTP_MAX_REQUEST_METHOD;
+ ulong i, meth_num = HTTP_G(request).methods.custom.nNextFreeElement + HTTP_MAX_REQUEST_METHOD;
method = emalloc(method_name_len + 1);
for (i = 0; i < method_name_len; ++i) {
/* }}} */
/* {{{ STATUS http_request_method_unregister(usngigned long) */
-PHP_HTTP_API STATUS _http_request_method_unregister(unsigned long method TSRMLS_DC)
+PHP_HTTP_API STATUS _http_request_method_unregister(ulong method TSRMLS_DC)
{
zval **zmethod;
char *http_method;