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

diff --git a/scripts/gen_curlinfo.php b/scripts/gen_curlinfo.php
index 2e2100f..0aa9c5e 100755
--- a/scripts/gen_curlinfo.php
+++ b/scripts/gen_curlinfo.php
@@ -4,17 +4,15 @@
 error_reporting(0);
 
 function failure() {
-	// this is why error_get_last() should return a stdClass object
-	$error = error_get_last();
-	fprintf(STDERR, "FAILURE: %s\n", $error["message"]);
+	fprintf(STDERR, "FAILURE: %s\n", error_get_last()["message"]);
 	exit(-1);
 }
 
 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)) {
@@ -33,15 +31,28 @@ 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)',
+	'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(
-    'PRIVATE', 'LASTSOCKET', 'FTP_ENTRY_PATH', 'CERTINFO', 'TLS_SESSION',
-    'RTSP_SESSION_ID', 'RTSP_CLIENT_CSEQ', 'RTSP_SERVER_CSEQ', 'RTSP_CSEQ_RECV',
-	'COOKIELIST'
+	'ACTIVESOCKET',
+	'CERTINFO',
+	'COOKIELIST',
+	'FTP_ENTRY_PATH',
+	'LASTSOCKET',
+	'PRIVATE',
+	'RTSP_CLIENT_CSEQ',
+	'RTSP_CSEQ_RECV',
+	'RTSP_SERVER_CSEQ',
+	'RTSP_SESSION_ID',
+	'TLS_SESSION',
+	'TLS_SSL_PTR',
 );
 
 $translate = array(
@@ -50,19 +61,19 @@ $translate = array(
 );
 
 $templates = array(
-'STRING' => 
+'STRING' =>
 '	if (CURLE_OK == curl_easy_getinfo(ch, %s, &c)) {
 		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)) {
 		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)) {
 		ZVAL_LONG(&tmp, l);
 		zend_hash_str_update(info, "%s", lenof("%2$s"), &tmp);
@@ -93,8 +104,8 @@ foreach ($infos as $info) {
 	if (isset($ifdefs[$short])) printf("#endif\n");
 }
 
-file_put_contents("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("php_http_client_curl.c")));
+		file_get_contents("src/php_http_client_curl.c")));
 
 ?>