X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_filter_api.c;h=444e3d067ffb530c829b820845f9ec139eab5ce9;hb=3706c9ddb362d54d409506010952a0129e78e5e9;hp=ee42d608486e524523244da2ca2d5e83e1d66475;hpb=41d6cf70475c5a4e12dae565ffcf51de7f6fe120;p=m6w6%2Fext-http

diff --git a/http_filter_api.c b/http_filter_api.c
index ee42d60..444e3d0 100644
--- a/http_filter_api.c
+++ b/http_filter_api.c
@@ -15,15 +15,14 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-#include "php.h"
 
-#include "php_http_std_defs.h"
-#include "php_http_api.h"
-#include "php_http_filter_api.h"
+#include "php_http.h"
 
-#include "phpstr/phpstr.h"
+#ifdef ZEND_ENGINE_2
 
 #include "php_streams.h"
+#include "php_http_api.h"
+#include "php_http_filter_api.h"
 
 PHP_MINIT_FUNCTION(http_filter)
 {
@@ -175,7 +174,7 @@ static HTTP_FILTER_FUNCTION(chunked_decode)
 				
 				/* we need eol, so we can be sure we have all hex digits */
 				phpstr_fix(PHPSTR(buffer));
-				if (eolstr = http_locate_eol(PHPSTR_VAL(buffer), &eollen)) {
+				if ((eolstr = http_locate_eol(PHPSTR_VAL(buffer), &eollen))) {
 					char *stop = NULL;
 					
 					/* read in chunk size */
@@ -287,7 +286,7 @@ static php_stream_filter *http_filter_create(const char *name, zval *params, int
 	if (!strcasecmp(name, "http.chunked_decode")) {
 		http_filter_buffer *b = NULL;
 		
-		if (b = pecalloc(1, sizeof(http_filter_buffer), p)) {
+		if ((b = pecalloc(1, sizeof(http_filter_buffer), p))) {
 			phpstr_init_ex(PHPSTR(b), 4096, p ? PHPSTR_INIT_PERSISTENT : 0);
 			if (!(f = php_stream_filter_alloc(&HTTP_FILTER_OP(chunked_decode), b, p))) {
 				pefree(b, p);
@@ -306,6 +305,8 @@ php_stream_filter_factory http_filter_factory = {
 	http_filter_create
 };
 
+#endif /* ZEND_ENGINE_2 */
+
 /*
  * Local variables:
  * tab-width: 4