X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=scripts%2Fgen_curlinfo.php;h=0aa9c5eca5e505f50b7779fdede9ab0292f57cbb;hp=de84b40f3f5870422ba6819a55cc8d3c2c475abc;hb=6468b6bd18f23e760198b7b7dfcbb33b7c62f981;hpb=061a30e33e42ae9332a56c26cbe15bccc9d0f61f

diff --git a/scripts/gen_curlinfo.php b/scripts/gen_curlinfo.php
index de84b40..0aa9c5e 100755
--- a/scripts/gen_curlinfo.php
+++ b/scripts/gen_curlinfo.php
@@ -1,6 +1,5 @@
 #!/usr/bin/env php
 <?php
-// $Id: gen_curlinfo.php 323304 2012-02-17 21:13:24Z mike $
 
 error_reporting(0);
 
@@ -11,9 +10,9 @@ function failure() {
 
 function file_re($file, $pattern, $all = true) {
 	static $path;
-	
+
 	$path or $path = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1].'/include/curl/' : "/usr/local/include/curl/";
-	
+
 	if ($content = file_get_contents($path . $file)) {
 		if ($all) {
 			if (preg_match_all($pattern, $content, $matches, PREG_SET_ORDER)) {
@@ -32,11 +31,14 @@ function file_re($file, $pattern, $all = true) {
 $ifdefs = array(
 	'PRIMARY_IP' => 'PHP_HTTP_CURL_VERSION(7,19,0)',
 	'APPCONNECT_TIME' => 'PHP_HTTP_CURL_VERSION(7,19,0)',
-    'CONDITION_UNMET' => 'PHP_HTTP_CURL_VERSION(7,19,4)',
-    'PRIMARY_PORT' => 'PHP_HTTP_CURL_VERSION(7,21,0)',
-    'LOCAL_PORT' => 'PHP_HTTP_CURL_VERSION(7,21,0)',
-    'LOCAL_IP' => 'PHP_HTTP_CURL_VERSION(7,21,0)',
-	'HTTP_VERSION' => 'PHP_HTTP_CURL_VERSION(7,50,0)'
+	'CONDITION_UNMET' => 'PHP_HTTP_CURL_VERSION(7,19,4)',
+	'PRIMARY_PORT' => 'PHP_HTTP_CURL_VERSION(7,21,0)',
+	'LOCAL_PORT' => 'PHP_HTTP_CURL_VERSION(7,21,0)',
+	'LOCAL_IP' => 'PHP_HTTP_CURL_VERSION(7,21,0)',
+	'HTTP_VERSION' => 'PHP_HTTP_CURL_VERSION(7,50,0)',
+	'PROXY_SSL_VERIFYRESULT' => 'PHP_HTTP_CURL_VERSION(7,52,0)',
+	'PROTOCOL' => 'PHP_HTTP_CURL_VERSION(7,52,0)',
+	'SCHEME' => 'PHP_HTTP_CURL_VERSION(7,52,0)',
 );
 $exclude = array(
 	'ACTIVESOCKET',
@@ -59,31 +61,33 @@ $translate = array(
 );
 
 $templates = array(
-'STRING' => 
+'STRING' =>
 '	if (CURLE_OK == curl_easy_getinfo(ch, %s, &c)) {
-		add_assoc_string_ex(&array, "%s", sizeof("%2$s"), c ? c : "", 1);
+		ZVAL_STRING(&tmp, STR_PTR(c));
+		zend_hash_str_update(info, "%s", lenof("%2$s"), &tmp);
 	}
 ',
-'DOUBLE' => 
+'DOUBLE' =>
 '	if (CURLE_OK == curl_easy_getinfo(ch, %s, &d)) {
-		add_assoc_double_ex(&array, "%s", sizeof("%2$s"), d);
+		ZVAL_DOUBLE(&tmp, d);
+		zend_hash_str_update(info, "%s", lenof("%2$s"), &tmp);
 	}
 ',
-'LONG' => 
+'LONG' =>
 '	if (CURLE_OK == curl_easy_getinfo(ch, %s, &l)) {
-		add_assoc_long_ex(&array, "%s", sizeof("%2$s"), l);
+		ZVAL_LONG(&tmp, l);
+		zend_hash_str_update(info, "%s", lenof("%2$s"), &tmp);
 	}
 ',
 'SLIST' =>
 '	if (CURLE_OK == curl_easy_getinfo(ch, %s, &s)) {
-		MAKE_STD_ZVAL(subarray);
-		array_init(subarray);
+		array_init(&tmp);
 		for (p = s; p; p = p->next) {
 			if (p->data) {
-				add_next_index_string(subarray, p->data, 1);
+				add_next_index_string(&tmp, p->data);
 			}
 		}
-		add_assoc_zval_ex(&array, "%s", sizeof("%2$s"), subarray);
+		zend_hash_str_update(info, "%s", lenof("%2$s"), &tmp);
 		curl_slist_free_all(s);
 	}
 ',
@@ -100,7 +104,7 @@ foreach ($infos as $info) {
 	if (isset($ifdefs[$short])) printf("#endif\n");
 }
 
-file_put_contents("src/php_http_client_curl.c", 
+file_put_contents("src/php_http_client_curl.c",
 	preg_replace('/(\/\* BEGIN::CURLINFO \*\/\n).*(\n\s*\/\* END::CURLINFO \*\/)/s', '$1'. ob_get_contents() .'$2',
 		file_get_contents("src/php_http_client_curl.c")));