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

diff --git a/scripts/gen_curlinfo.php b/scripts/gen_curlinfo.php
old mode 100644
new mode 100755
index 54137ba..0aa9c5e
--- a/scripts/gen_curlinfo.php
+++ b/scripts/gen_curlinfo.php
@@ -1,21 +1,18 @@
 #!/usr/bin/env php
 <?php
-// $Id$
 
 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)) {
@@ -32,47 +29,68 @@ function file_re($file, $pattern, $all = true) {
 }
 
 $ifdefs = array(
-	'COOKIELIST' => 'HTTP_CURL_VERSION(7,14,1)',
-	'PRIMARY_IP' => 'HTTP_CURL_VERSION(7,19,0)',
-	'APPCONNECT_TIME' => 'HTTP_CURL_VERSION(7,19,0)',
-	'REDIRECT_URL' => 'HTTP_CURL_VERSION(7,18,2)',
-	'CERTINFO' => 'HTTP_CURL_VERSION(7,19,1) && defined(HTTP_HAVE_OPENSSL)'
+	'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)',
+	'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'
+	'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(
 	'HTTP_CONNECTCODE' => "connect_code",
 	'COOKIELIST' => 'cookies',
 );
 
 $templates = array(
-'STRING' => 
-'	if (CURLE_OK == curl_easy_getinfo(request->ch, %s, &c)) {
-		add_assoc_string_ex(&array, "%s", sizeof("%2$s"), c ? c : "", 1);
+'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' => 
-'	if (CURLE_OK == curl_easy_getinfo(request->ch, %s, &d)) {
-		add_assoc_double_ex(&array, "%s", sizeof("%2$s"), d);
+'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' => 
-'	if (CURLE_OK == curl_easy_getinfo(request->ch, %s, &l)) {
-		add_assoc_long_ex(&array, "%s", sizeof("%2$s"), l);
+'LONG' =>
+'	if (CURLE_OK == curl_easy_getinfo(ch, %s, &l)) {
+		ZVAL_LONG(&tmp, l);
+		zend_hash_str_update(info, "%s", lenof("%2$s"), &tmp);
 	}
 ',
-'SLIST' => 
-'	if (CURLE_OK == curl_easy_getinfo(request->ch, %s, &s)) {
-		MAKE_STD_ZVAL(subarray);
-		array_init(subarray);
+'SLIST' =>
+'	if (CURLE_OK == curl_easy_getinfo(ch, %s, &s)) {
+		array_init(&tmp);
 		for (p = s; p; p = p->next) {
-			add_next_index_string(subarray, p->data, 1);
+			if (p->data) {
+				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);
 	}
-'
+',
 );
 
 $infos = file_re('curl.h', '/^\s*(CURLINFO_(\w+))\s*=\s*CURLINFO_(STRING|LONG|DOUBLE|SLIST)\s*\+\s*\d+\s*,?\s*$/m');
@@ -86,8 +104,8 @@ foreach ($infos as $info) {
 	if (isset($ifdefs[$short])) printf("#endif\n");
 }
 
-file_put_contents("http_request_info.c", 
-	preg_replace('/(\/\* BEGIN \*\/\n).*(\/\* END \*\/)/s', '$1'. ob_get_contents() .'$2',
-		file_get_contents("http_request_info.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")));
 
 ?>