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 pass by ref in HttpRequestPool::__construct(), please
[m6w6/ext-http]
/
http_request_method_api.c
diff --git
a/http_request_method_api.c
b/http_request_method_api.c
index be19f492ce9832609e4028e9c83a8724d2283862..9e5c79a0c9be133c63ea940ceeff001708627223 100644
(file)
--- a/
http_request_method_api.c
+++ b/
http_request_method_api.c
@@
-15,19
+15,18
@@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include "php.h"
+#define HTTP_WANT_CURL
#include "php_http.h"
#include "php_http.h"
-#include "php_http_std_defs.h"
+
#include "php_http_api.h"
#include "php_http_api.h"
+#include "php_http_request_api.h"
#include "php_http_request_method_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 "php_http_request_object.h"
#endif
-#include "missing.h"
-#include "phpstr/phpstr.h"
-
ZEND_EXTERN_MODULE_GLOBALS(http);
/* {{{ char *http_request_methods[] */
ZEND_EXTERN_MODULE_GLOBALS(http);
/* {{{ char *http_request_methods[] */
@@
-148,8
+147,9
@@
PHP_HTTP_API ulong _http_request_method_exists(zend_bool by_name, ulong id, cons
zval **data;
char *key;
ulong idx;
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;
}
if (!strcmp(name, Z_STRVAL_PP(data))) {
return idx + HTTP_MAX_REQUEST_METHOD;
}