fix build

diff --git a/src/php_http_api.h b/src/php_http_api.h
index 2313413f30af7761cd216f34bbd45718c8f8df20..e8c175fa6784df0e8a0d80ed2b1dd727fa3d9493 100644 (file)
--- a/src/php_http_api.h
+++ b/src/php_http_api.h
@@ -23,8 +23,8 @@
 #include <php.h>
 #include <SAPI.h>
 
-#include <ext/raphf/php_raphf.h>
-#include <ext/propro/php_propro.h>
+#include <ext/raphf/php_raphf_api.h>
+#include <ext/propro/php_propro_api.h>
 #include <ext/standard/php_string.h>
 #include <ext/spl/spl_iterators.h>
 #include <ext/date/php_date.h>

diff --git a/src/php_http_client_curl.c b/src/php_http_client_curl.c
index 85f12b7734f4201d6c308687d52f9e471d3e8150..e79ef1519ce5c39ba5a7fefc433db7d1be96b07b 100644 (file)
--- a/src/php_http_client_curl.c
+++ b/src/php_http_client_curl.c
@@ -1230,7 +1230,7 @@ static void php_http_curle_options_init(php_http_options_t *registry)
 
        /* url options */
 #if PHP_HTTP_CURL_VERSION(7,42,0)
-       php_http_option_register(registry, ZEND_STRL("path_as_is"), CURLOPT_PATH_AS_IS, IS_BOOL);
+       php_http_option_register(registry, ZEND_STRL("path_as_is"), CURLOPT_PATH_AS_IS, _IS_BOOL);
 #endif
 
        /* proxy */

diff --git a/src/php_http_negotiate.c b/src/php_http_negotiate.c
index d2410f88651a7d8014e9ad68560e6716a3983ef6..9fdad26ff0e909041b45e9aec74e18dd6d77b6df 100644 (file)
--- a/src/php_http_negotiate.c
+++ b/src/php_http_negotiate.c
@@ -14,13 +14,10 @@
 
 static int php_http_negotiate_sort(const void *first, const void *second)
 {
-       zval result;
        Bucket *b1 = (Bucket *) first, *b2 = (Bucket *) second;
+       int result = numeric_compare_function(&b1->val, &b2->val);
 
-       if (numeric_compare_function(&result, &b1->val, &b2->val)!= SUCCESS) {
-               return 0;
-       }
-       return (Z_LVAL(result) > 0 ? -1 : (Z_LVAL(result) < 0 ? 1 : 0));
+       return (result > 0 ? -1 : (result < 0 ? 1 : 0));
 }
 
 #define M_PRI 5
@@ -156,7 +153,7 @@ HashTable *php_http_negotiate(const char *value_str, size_t value_len, HashTable
                zval_dtor(&arr);
                zend_hash_sort(result, php_http_negotiate_sort, 0);
        }
-       
+
        return result;
 }