prepare v4.2.5

[m6w6/ext-http] / scripts / gen_curlinfo.php

diff --git a/scripts/gen_curlinfo.php b/scripts/gen_curlinfo.php
index 9fae4cb8d78c6baee7873b89a7a491e1a3c1d22e..ab4391dccef9eb2b09463cbbcf9e35b619551ef8 100755 (executable)
--- a/scripts/gen_curlinfo.php
+++ b/scripts/gen_curlinfo.php
@@ -31,14 +31,20 @@ 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)',
+       'RETRY_AFTER' => 'PHP_HTTP_CURL_VERSION(7,66,0)',
+       'EFFECTIVE_METHOD' => 'PHP_HTTP_CURL_VERSION(7,72,0)',
+       'PROXY_ERROR' => 'PHP_HTTP_CURL_VERSION(7,73,0)',
+       'REFERER' => 'PHP_HTTP_CURL_VERSION(7,76,0)',
+       'CAINFO' => 'PHP_HTTP_CURL_VERSION(7,84,0)',
+       'CAPATH' => 'PHP_HTTP_CURL_VERSION(7,84,0)',
 );
 $exclude = array(
        'ACTIVESOCKET',
@@ -79,6 +85,12 @@ $templates = array(
                zend_hash_str_update(info, "%s", lenof("%2$s"), &tmp);
        }
 ',
+'OFF_T' =>
+'      if (CURLE_OK == curl_easy_getinfo(ch, %s, &o)) {
+               ZVAL_LONG(&tmp, o);
+               zend_hash_str_update(info, "%s", lenof("%2$s"), &tmp);
+       }
+',
 'SLIST' =>
 '      if (CURLE_OK == curl_easy_getinfo(ch, %s, &s)) {
                array_init(&tmp);
@@ -93,8 +105,8 @@ $templates = array(
 ',
 );
 
-$infos = file_re('curl.h', '/^\s*(CURLINFO_(\w+))\s*=\s*CURLINFO_(STRING|LONG|DOUBLE|SLIST)\s*\+\s*\d+\s*,?\s*$/m');
-
+$infos = file_re('curl.h', '/\s*(CURLINFO_(\w+))\s*(?:CURL_DEPRECATED\(\d+\.\d+\.\d+,\s*"[\w _-]+"\))?\s*=\s*CURLINFO_(STRING|LONG|DOUBLE|SLIST|OFF_T)\s*\+\s*\d+\s*,?\s*/m');
+var_dump($infos);
 ob_start();
 foreach ($infos as $info) {
        list(, $full, $short, $type) = $info;