PHP 7.4: ulong->unsigned long, uint->uint32_t

[m6w6/ext-http] / src / php_http_filter.c

diff --git a/src/php_http_filter.c b/src/php_http_filter.c
index 2b81100b2722c3fc2949774a3737e686407a0413..52d2b03f584774f931369028cba53d00de8c3987 100644 (file)
--- a/src/php_http_filter.c
+++ b/src/php_http_filter.c
@@ -72,7 +72,7 @@ PHP_MINIT_FUNCTION(http_filter)
 
 typedef struct _http_chunked_decode_filter_buffer_t {
        php_http_buffer_t       buffer;
-       ulong   hexlen;
+       unsigned long   hexlen;
 } PHP_HTTP_FILTER_BUFFER(chunked_decode);
 
 typedef php_http_encoding_stream_t PHP_HTTP_FILTER_BUFFER(stream);
@@ -381,6 +381,7 @@ static PHP_HTTP_FILTER_OPS(inflate) = {
        "http.inflate"
 };
 
+#if PHP_HTTP_HAVE_LIBBROTLI
 static PHP_HTTP_FILTER_OPS(brotli_encode) = {
        PHP_HTTP_FILTER_FUNC(stream),
        PHP_HTTP_FILTER_DTOR(stream),
@@ -392,6 +393,7 @@ static PHP_HTTP_FILTER_OPS(brotli_decode) = {
        PHP_HTTP_FILTER_DTOR(stream),
        "http.brotli_decode"
 };
+#endif
 
 #if PHP_VERSION_ID >= 70200
 static php_stream_filter *http_filter_create(const char *name, zval *params, uint8_t p)
@@ -450,6 +452,7 @@ static php_stream_filter *http_filter_create(const char *name, zval *params, int
                                php_http_encoding_stream_free(&b);
                        }
                }
+#if PHP_HTTP_HAVE_LIBBROTLI
        } else
 
        if (!strcasecmp(name, "http.brotli_encode")) {
@@ -470,6 +473,7 @@ static php_stream_filter *http_filter_create(const char *name, zval *params, int
                                php_http_encoding_stream_free(&b);
                        }
                }
+#endif
        }
        
        return f;