X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=scripts%2Fgen_curlinfo.php;h=f234685ea7abc8c36b4a936427e9325315b3a031;hp=129833a2a9fe87c435eabfff2ebe482a19032520;hb=b1ace11a9604ffcc496d32827aa66a2ba99db5ff;hpb=aebfa7783e7b280bff4975649b20494e5eb932bc

diff --git a/scripts/gen_curlinfo.php b/scripts/gen_curlinfo.php
index 129833a..f234685 100644
--- a/scripts/gen_curlinfo.php
+++ b/scripts/gen_curlinfo.php
@@ -1,10 +1,13 @@
+#!/usr/bin/env php
 <?php
 // $Id$
 
 error_reporting(0);
 
 function failure() {
-	fprintf(STDERR, "FAILURE: %s\n", error_get_last());
+	// this is why error_get_last() should return a stdClass object
+	$error = error_get_last();
+	fprintf(STDERR, "FAILURE: %s\n", $error["message"]);
 	exit(-1);
 }
 
@@ -28,22 +31,19 @@ function file_re($file, $pattern, $all = true) {
 	failure();
 }
 
-function version($major, $minor, $pl) {
-	static $version;
-	
-	$version or $version = file_re('curlver.h', '/^#\s*define\s+LIBCURL_VERSION\s+"(\d+)\.(\d+)\.(\d+)(?:-\w+)?"\s*$/m', false);
-	
-	return $major <= $version[1] && $minor <= $version[2] && $pl <= $version[3];
-}
-
 $ifdefs = array(
-	'COOKIELIST' => '7,14,1'
+	'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)',
+	'CONDITION_UNMET' => 'HTTP_CURL_VERSION(7,19,4)',
 );
 $exclude = array(
-	'PRIVATE', 'LASTSOCKET', 'FTP_ENTRY_PATH'
+	'PRIVATE', 'LASTSOCKET', 'FTP_ENTRY_PATH', 'CERTINFO',
 );
 $translate = array(
-	'HTTP_CONNECTCODE' => "connect_code"
+	'HTTP_CONNECTCODE' => "connect_code",
+	'COOKIELIST' => 'cookies',
 );
 
 $templates = array(
@@ -62,29 +62,29 @@ $templates = array(
 		add_assoc_long_ex(&array, "%s", sizeof("%2$s"), l);
 	}
 ',
-'SLIST' => 
+'SLIST' =>
 '	if (CURLE_OK == curl_easy_getinfo(request->ch, %s, &s)) {
 		MAKE_STD_ZVAL(subarray);
 		array_init(subarray);
 		for (p = s; p; p = p->next) {
-			add_next_index_string(subarray, p->data, 1);
+			if (p->data) {
+				add_next_index_string(subarray, p->data, 1);
+			}
 		}
 		add_assoc_zval_ex(&array, "%s", sizeof("%2$s"), subarray);
 		curl_slist_free_all(s);
 	}
-'
+',
 );
 
-$types = file_re('curl.h', '/^#\s*define\s+CURLINFO_(STRING|LONG|DOUBLE|SLIST|MASK|TYPEMASK)\s+(0x[0-9a-fA-F]+)\s*$/m');
 $infos = file_re('curl.h', '/^\s*(CURLINFO_(\w+))\s*=\s*CURLINFO_(STRING|LONG|DOUBLE|SLIST)\s*\+\s*\d+\s*,?\s*$/m');
 
 ob_start();
 foreach ($infos as $info) {
 	list(, $full, $short, $type) = $info;
 	if (in_array($short, $exclude)) continue;
-	if (isset($ifdefs[$short])) printf("#if HTTP_CURL_VERSION(%s)\n", $ifdefs[$short]);
-	if (isset($translate[$short])) $short = $translate[$short];
-	printf($templates[$type], $full, strtolower($short));
+	if (isset($ifdefs[$short])) printf("#if %s\n", $ifdefs[$short]);
+	printf($templates[$type], $full, strtolower((isset($translate[$short])) ? $translate[$short] : $short));
 	if (isset($ifdefs[$short])) printf("#endif\n");
 }