prepare v4.2.5

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

diff --git a/scripts/gen_curlinfo.php b/scripts/gen_curlinfo.php
index 2e2100fd68d7174768315e7f86fa31bb972bd262..ab4391dccef9eb2b09463cbbcf9e35b619551ef8 100755 (executable)
--- 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,34 @@ 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(
-    '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,24 +67,30 @@ $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);
        }
 ',
+'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);
@@ -82,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;
@@ -93,8 +116,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")));
 
 ?>