projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- wrap request exceptions into one request pool exception
[m6w6/ext-http]
/
http_response_object.c
diff --git
a/http_response_object.c
b/http_response_object.c
index 0d6cfa7cd59d2c150e7ab86a2c238c947fe0029e..5d46fa509c73c7efaf2c4ec9428b71cae0dd0640 100644
(file)
--- a/
http_response_object.c
+++ b/
http_response_object.c
@@
-16,9
+16,9
@@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include "php.h"
-#include "missing.h"
+#define HTTP_WANT_MAGIC
+#include "php_http.h"
/* broken static properties in PHP 5.0 */
#if defined(ZEND_ENGINE_2) && !defined(WONKY)
/* broken static properties in PHP 5.0 */
#if defined(ZEND_ENGINE_2) && !defined(WONKY)
@@
-26,18
+26,13
@@
#include "SAPI.h"
#include "php_ini.h"
#include "SAPI.h"
#include "php_ini.h"
-#include "php_http.h"
#include "php_http_api.h"
#include "php_http_api.h"
-#include "php_http_std_defs.h"
-#include "php_http_response_object.h"
-#include "php_http_exception_object.h"
-#include "php_http_send_api.h"
#include "php_http_cache_api.h"
#include "php_http_cache_api.h"
+#include "php_http_exception_object.h"
#include "php_http_headers_api.h"
#include "php_http_headers_api.h"
+#include "php_http_response_object.h"
+#include "php_http_send_api.h"
-#ifdef HTTP_HAVE_MAGIC
-# include <magic.h>
-#endif
ZEND_EXTERN_MODULE_GLOBALS(http);
ZEND_EXTERN_MODULE_GLOBALS(http);