X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=gen_curlinfo.php;h=2e2100fd68d7174768315e7f86fa31bb972bd262;hp=0e8dfa1272da5553a3c6267e0c594dee6d991767;hb=5e56841ce913380b8c2a8f2f602ad9bc1f20014e;hpb=62e9d3e1f5ec8896131313c70574ce7f7cbcfc99

diff --git a/gen_curlinfo.php b/gen_curlinfo.php
index 0e8dfa1..2e2100f 100755
--- a/gen_curlinfo.php
+++ b/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);
 
@@ -41,7 +40,8 @@ $ifdefs = array(
 );
 $exclude = array(
     'PRIVATE', 'LASTSOCKET', 'FTP_ENTRY_PATH', 'CERTINFO', 'TLS_SESSION',
-    'RTSP_SESSION_ID', 'RTSP_CLIENT_CSEQ', 'RTSP_SERVER_CSEQ', 'RTSP_CSEQ_RECV'
+    'RTSP_SESSION_ID', 'RTSP_CLIENT_CSEQ', 'RTSP_SERVER_CSEQ', 'RTSP_CSEQ_RECV',
+	'COOKIELIST'
 );
 
 $translate = array(
@@ -52,29 +52,31 @@ $translate = array(
 $templates = array(
 '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' => 
 '	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' => 
 '	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);
 	}
 ',