projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- reorder includes, always include php.h first
[m6w6/ext-http]
/
http_methods.c
diff --git
a/http_methods.c
b/http_methods.c
index efc1cf73469d7515f6e6a2d5273cff3f15791e44..08959ed0c152c9c2ec0e490bc5e57de4b23543cf 100644
(file)
--- a/
http_methods.c
+++ b/
http_methods.c
@@
-18,8
+18,10
@@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-
#include "php.h"
#include "php.h"
+
+#ifdef ZEND_ENGINE_2
+
#include "php_streams.h"
#include "php_http.h"
#include "php_streams.h"
#include "php_http.h"
@@
-40,11
+42,9
@@
#include "php_http_requestpool_object.h"
#include "php_http_exception_object.h"
#include "php_http_requestpool_object.h"
#include "php_http_exception_object.h"
-#ifdef ZEND_ENGINE_2
-
#include "missing.h"
#include "missing.h"
-ZEND_EXTERN_MODULE_GLOBALS(http)
+ZEND_EXTERN_MODULE_GLOBALS(http)
;
/* {{{ HttpResponse */
/* {{{ HttpResponse */
@@
-1133,7
+1133,7
@@
PHP_METHOD(HttpRequest, __destruct)
PHP_METHOD(HttpRequest, setOptions)
{
char *key = NULL;
PHP_METHOD(HttpRequest, setOptions)
{
char *key = NULL;
- long idx = 0;
+
u
long idx = 0;
zval *opts, *old_opts, **opt;
getObject(http_request_object, obj);
zval *opts, *old_opts, **opt;
getObject(http_request_object, obj);