]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
test1175: fix to run, and fix documentation issues detected
authorViktor Szakats <commit@vsz.me>
Wed, 9 Jul 2025 22:36:03 +0000 (00:36 +0200)
committerViktor Szakats <commit@vsz.me>
Fri, 11 Jul 2025 10:28:46 +0000 (12:28 +0200)
Fix test 1175 by passing the source root directory (was: tests).

Before this patch this caused silent Perl warnings and returning success
without executing the tests, due to:
```
readline() on closed filehandle $f at ../../tests/test1175.pl line 55.
readline() on closed filehandle $f at ../../tests/test1175.pl line 39.
```

Running the test revealed these issues:
```
CURLE_FUNCTION_NOT_FOUND is not in libcurl-errors.md
CURLE_HTTP_POST_ERROR is not in libcurl-errors.md
CURLE_TELNET_OPTION_SYNTAX is not in libcurl-errors.md
CURLM_CALL_MULTI_SOCKET is not in libcurl-errors.md
```

Apply fixes:
- mark `CURLE_FUNCTION_NOT_FOUND` deprecated by 7.53.0
- mark `CURLE_HTTP_POST_ERROR` deprecated by 7.56.0
- mark `CURLE_TELNET_OPTION_SYNTAX` deprecated by 7.78.0
- document `CURLM_CALL_MULTI_SOCKET` as a synonym for
  `CURLM_CALL_MULTI_PERFORM`
- test1477: exclude `CURLM_CALL_MULTI_SOCKET`.

But, these weren't officially deprecated. It may need more updates
to reflect that in other places, or fix the issues differently.

Follow-up to 66ec950004cd45350ad81134557be86391397048 #12424
Follow-up to 74f441c6d31ff8f8bfd242c3d4027d4a56230ce1 #4628

Cherry-picked from #17877
Closes #17880

docs/libcurl/libcurl-errors.md
docs/libcurl/symbols-in-versions
tests/data/test1175
tests/test1477.pl

index ed2f4ca5a705e2b21807c343f24d1457072bc414..773601dae71f918821d7d9ac293477524dfc2c6a 100644 (file)
@@ -505,6 +505,12 @@ between. Before version 7.20.0 (released on February 9 2010) this could be retur
 curl_multi_perform(3), but in later versions this return code is never
 used.
 
+## CURLM_CALL_MULTI_SOCKET (-1)
+
+An alias for *CURLM_CALL_MULTI_PERFORM*. Never returned by modern libcurl
+versions.
+(Added in 7.15.5)
+
 ## CURLM_OK (0)
 
 Things are fine.
index 942dadbbf982e610d92a214ac9f11aa87f224589..54b1d4f222595ad6cda18a7b9f7cdbac2173706c 100644 (file)
@@ -263,14 +263,14 @@ CURLE_FTP_WEIRD_PASV_REPLY      7.1
 CURLE_FTP_WEIRD_SERVER_REPLY    7.1           7.51.0
 CURLE_FTP_WEIRD_USER_REPLY      7.1           7.17.0
 CURLE_FTP_WRITE_ERROR           7.1           7.17.0
-CURLE_FUNCTION_NOT_FOUND        7.1
+CURLE_FUNCTION_NOT_FOUND        7.1           7.53.0
 CURLE_GOT_NOTHING               7.9.1
 CURLE_HTTP2                     7.38.0
 CURLE_HTTP2_STREAM              7.49.0
 CURLE_HTTP3                     7.68.0
 CURLE_HTTP_NOT_FOUND            7.1           7.10.3
 CURLE_HTTP_PORT_FAILED          7.3           7.12.0
-CURLE_HTTP_POST_ERROR           7.1
+CURLE_HTTP_POST_ERROR           7.1           7.56.0
 CURLE_HTTP_RANGE_ERROR          7.1           7.17.0
 CURLE_HTTP_RETURNED_ERROR       7.10.3
 CURLE_INTERFACE_FAILED          7.12.0
@@ -321,7 +321,7 @@ CURLE_SSL_ISSUER_ERROR          7.19.0
 CURLE_SSL_PEER_CERTIFICATE      7.8           7.17.1
 CURLE_SSL_PINNEDPUBKEYNOTMATCH  7.39.0
 CURLE_SSL_SHUTDOWN_FAILED       7.16.1
-CURLE_TELNET_OPTION_SYNTAX      7.7
+CURLE_TELNET_OPTION_SYNTAX      7.7           7.78.0
 CURLE_TFTP_DISKFULL             7.15.0        7.17.0
 CURLE_TFTP_EXISTS               7.15.0        7.17.0
 CURLE_TFTP_ILLEGAL              7.15.0
index 6e99a616eea19cfb3a758f1740e7d9b822db6da7..cfffa673027188e3e7c0b1c0c1bf8306d8e850e2 100644 (file)
@@ -18,7 +18,7 @@ Verify that symbols-in-versions and libcurl-errors.3 are in sync
 </name>
 
 <command type="perl">
-%SRCDIR/test1175.pl %SRCDIR
+%SRCDIR/test1175.pl %SRCDIR/..
 </command>
 </client>
 
index 089e9e3ae64c8f354b2285345ec674c06624376b..8d3e1deca55eca393ac471ac4441ba79e0af87c9 100755 (executable)
@@ -69,8 +69,10 @@ sub scanmanpage {
         $line++;
         if($_ =~ /^\.IP \"(CURL(E|UE|SHE|HE|M)_[A-Z0-9_]*)/) {
             my ($name)=($1);
-            push @mnames, $name;
-            $manfrom{$name}="$file:$line";
+            if($name !~ /(CURLM_CALL_MULTI_SOCKET)/) {
+                push @mnames, $name;
+                $manfrom{$name}="$file:$line";
+            }
         }
     }
     close(H);