projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- add ob_(deflate|inflate)handler
[m6w6/ext-http]
/
http_api.c
diff --git
a/http_api.c
b/http_api.c
index 27986373b2f328895cd22ecb7c5c933e0506b2b3..07cb9f4dbced71aadc65962c5735266befb3c248 100644
(file)
--- a/
http_api.c
+++ b/
http_api.c
@@
-21,7
+21,6
@@
#include "SAPI.h"
#include "php_output.h"
#include "ext/standard/url.h"
#include "SAPI.h"
#include "php_output.h"
#include "ext/standard/url.h"
-#include "ext/standard/head.h"
#include "php_http_api.h"
#include "php_http_send_api.h"
#include "php_http_api.h"
#include "php_http_send_api.h"
@@
-30,8
+29,6
@@
# include "php_http_exception_object.h"
#endif
# include "php_http_exception_object.h"
#endif
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
PHP_MINIT_FUNCTION(http_support)
{
HTTP_LONG_CONSTANT("HTTP_SUPPORT", HTTP_SUPPORT);
PHP_MINIT_FUNCTION(http_support)
{
HTTP_LONG_CONSTANT("HTTP_SUPPORT", HTTP_SUPPORT);
@@
-56,7
+53,7
@@
PHP_HTTP_API long _http_support(long feature)
#ifdef HTTP_HAVE_MAGIC
support |= HTTP_SUPPORT_MAGICMIME;
#endif
#ifdef HTTP_HAVE_MAGIC
support |= HTTP_SUPPORT_MAGICMIME;
#endif
-#if
defined(HTTP_HAVE_ZLIB) || defined(HAVE_ZLIB)
+#if
def HTTP_HAVE_ZLIB
support |= HTTP_SUPPORT_ENCODINGS;
#endif
support |= HTTP_SUPPORT_ENCODINGS;
#endif
@@
-250,7
+247,7
@@
STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header
}
php_end_ob_buffers(0 TSRMLS_CC);
}
php_end_ob_buffers(0 TSRMLS_CC);
- if (
php_header(TSRMLS_C
) && body) {
+ if (
(SUCCESS == sapi_send_headers(TSRMLS_C)
) && body) {
PHPWRITE(body, strlen(body));
}
PHPWRITE(body, strlen(body));
}