projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
# you better don't look inside
[m6w6/ext-http]
/
http_encoding_api.c
diff --git
a/http_encoding_api.c
b/http_encoding_api.c
index eecbbab5dad9650ac4107fa37034c8d7e1ed5c3f..7b726c879b75938e45a18a74d0737bec5fa6c516 100644
(file)
--- a/
http_encoding_api.c
+++ b/
http_encoding_api.c
@@
-15,17
+15,12
@@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include "php.h"
-
-#include "php_http_encoding_api.h"
#include "php_http.h"
#include "php_http.h"
-#include "php_http_api.h"
-#ifdef HTTP_HAVE_ZLIB
-# include "php_http_send_api.h"
-# include "php_http_headers_api.h"
-# include <zlib.h>
-#endif
+#include "php_http_api.h"
+#include "php_http_encoding_api.h"
+#include "php_http_send_api.h"
+#include "php_http_headers_api.h"
ZEND_EXTERN_MODULE_GLOBALS(http);
ZEND_EXTERN_MODULE_GLOBALS(http);
@@
-520,7
+515,7
@@
PHP_HTTP_API STATUS _http_encoding_stream_init(http_encoding_stream *s, int gzip
HTTP_ENCODING_STREAM_ERROR(status, NULL);
}
HTTP_ENCODING_STREAM_ERROR(status, NULL);
}
- if (
s->gzip = gzip
) {
+ if (
(s->gzip = gzip)
) {
s->crc = crc32(0L, Z_NULL, 0);
*encoded_len = sizeof(http_encoding_gzip_header);
*encoded = emalloc(*encoded_len);
s->crc = crc32(0L, Z_NULL, 0);
*encoded_len = sizeof(http_encoding_gzip_header);
*encoded = emalloc(*encoded_len);
@@
-622,7
+617,7
@@
PHP_HTTP_API zend_bool _http_encoding_response_start(size_t content_length TSRML
HTTP_G(send).gzip_encoding = 0;
HTTP_G(send).gzip_encoding = 0;
- if (
selected = http_negotiate_encoding(&zsupported
)) {
+ if (
(selected = http_negotiate_encoding(&zsupported)
)) {
STATUS hs = FAILURE;
char *encoding = NULL;
ulong idx;
STATUS hs = FAILURE;
char *encoding = NULL;
ulong idx;