Skip to content

[Sync-En] curl: fix the strerror, curl_version() and curl_exec() return values and the curl_upkeep() and curl_unescape() examples #1508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
julionc merged 1 commit into from
Oct 24, 2026
Merged

[Sync-En] curl: fix the strerror, curl_version() and curl_exec() return values and the curl_upkeep() and curl_unescape() examples #1508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions reference/curl/functions/curl-exec.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: fc9a0a8b29a7a099998bdd71fe5350a10b18fe62 Maintainer: PhilDaiguille Status: ready -->
<!-- EN-Revision: fd34024b25c6fd07abe850e8b880d1d0f8b442a4 Maintainer: PhilDaiguille Status: ready -->
<!-- Reviewed: no Maintainer: Marqitos -->
<refentry xml:id="function.curl-exec" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Expand Down Expand Up @@ -34,13 +34,21 @@

<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
<simpara>
En caso de éxito, esta función vacía el resultado directamente en
<literal>stdout</literal> y devuelve &true;, &return.falseforfailure;.
Sin embargo, si <constant>CURLOPT_RETURNTRANSFER</constant>
está <link linkend="function.curl-setopt">definida</link>, la función devolverá
el resultado en caso de éxito, y &false; en caso de fallo.
</para>
</simpara>
<simpara>
Si <constant>CURLOPT_FILE</constant> o
<constant>CURLOPT_WRITEFUNCTION</constant> está definida, el resultado se escribe en
ese fichero o se pasa a esa retrollamada en su lugar, no se escribe nada en
<literal>stdout</literal>, y se devuelve &true; en caso de éxito.
La última de estas opciones y de <constant>CURLOPT_RETURNTRANSFER</constant>
que se haya definido determina adónde va el resultado.
</simpara>
&return.falseproblem;
<note>
<para>
Expand Down
10 changes: 5 additions & 5 deletions reference/curl/functions/curl-multi-strerror.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 56171c30f4f4bb558537d9f5b400f21fdd2ebee8 Maintainer: PhilDaiguille Status: ready -->
<!-- EN-Revision: fd34024b25c6fd07abe850e8b880d1d0f8b442a4 Maintainer: PhilDaiguille Status: ready -->
<!-- Reviewed: no -->
<refentry xml:id="function.curl-multi-strerror" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
Expand Down Expand Up @@ -37,10 +37,10 @@

<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
Devuelve la descripción de un código de error válido,
&null; en caso contrario.
</para>
<simpara>
Devuelve la descripción del error. Para un código de error desconocido,
es <literal>"Unknown error"</literal>.
</simpara>
</refsect1>

<refsect1 role="seealso">
Expand Down
25 changes: 13 additions & 12 deletions reference/curl/functions/curl-share-strerror.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: b7f8c11e56ff1c57a2993e2ed7e5c5ace18637fd Maintainer: PhilDaiguille Status: ready -->
<!-- EN-Revision: fd34024b25c6fd07abe850e8b880d1d0f8b442a4 Maintainer: PhilDaiguille Status: ready -->
<!-- Reviewed: no -->
<refentry xml:id="function.curl-share-strerror" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>curl_share_strerror</refname>
<refpurpose>Devuelve un string que describe el código de error proporcionado</refpurpose>
</refnamediv>

<refsect1 role="description"><!-- {{{ -->
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
<type class="union"><type>string</type><type>null</type></type><methodname>curl_share_strerror</methodname>
Expand All @@ -17,9 +17,9 @@
<para>
Devuelve un mensaje de error textual que describe el código de error proporcionado.
</para>
</refsect1><!-- }}} -->
</refsect1>

<refsect1 role="parameters"><!-- {{{ -->
<refsect1 role="parameters">
&reftitle.parameters;
<variablelist>
<varlistentry>
Expand All @@ -31,22 +31,23 @@
</listitem>
</varlistentry>
</variablelist>
</refsect1><!-- }}} -->
</refsect1>

<refsect1 role="returnvalues"><!-- {{{ -->
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
Devuelve una descripción del error o &null; para los códigos de error inválidos.
</para>
</refsect1><!-- }}} -->
<simpara>
Devuelve la descripción del error. Para un código de error desconocido,
es <literal>"CURLSHcode unknown"</literal>.
</simpara>
</refsect1>

<refsect1 role="seealso"><!-- {{{ -->
<refsect1 role="seealso">
&reftitle.seealso;
<simplelist>
<member><function>curl_share_errno</function></member>
<member><function>curl_strerror</function></member>
</simplelist>
</refsect1><!-- }}} -->
</refsect1>

</refentry>
<!-- Keep this comment at the end of the file
Expand Down
9 changes: 5 additions & 4 deletions reference/curl/functions/curl-strerror.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: fc9a0a8b29a7a099998bdd71fe5350a10b18fe62 Maintainer: PhilDaiguille Status: ready -->
<!-- EN-Revision: fd34024b25c6fd07abe850e8b880d1d0f8b442a4 Maintainer: PhilDaiguille Status: ready -->
<!-- Reviewed: no Maintainer: Marqitos -->
<refentry xml:id="function.curl-strerror" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
Expand Down Expand Up @@ -37,9 +37,10 @@

<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
Devuelve la descripción del error o &null; para un código de error inválido.
</para>
<simpara>
Devuelve la descripción del error. Para un código de error desconocido,
es <literal>"Unknown error"</literal>.
</simpara>
</refsect1>

<refsect1 role="examples">
Expand Down
4 changes: 2 additions & 2 deletions reference/curl/functions/curl-unescape.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: fc9a0a8b29a7a099998bdd71fe5350a10b18fe62 Maintainer: PhilDaiguille Status: ready -->
<!-- EN-Revision: 4372c2fc19d3addb446b68e6db4187df6119a95d Maintainer: PhilDaiguille Status: ready -->
<!-- Reviewed: no Maintainer: Marqitos -->
<refentry xml:id="function.curl-unescape" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
Expand Down Expand Up @@ -63,7 +63,7 @@
&reftitle.examples;
<para>
<example>
<title>Ejemplo con <function>curl_escape</function></title>
<title>Ejemplo con <function>curl_unescape</function></title>
<programlisting role="php">
<![CDATA[
<?php
Expand Down
4 changes: 2 additions & 2 deletions reference/curl/functions/curl-upkeep.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- EN-Revision: fc9a0a8b29a7a099998bdd71fe5350a10b18fe62 Maintainer: PhilDaiguille Status: ready -->
<!-- EN-Revision: 4372c2fc19d3addb446b68e6db4187df6119a95d Maintainer: PhilDaiguille Status: ready -->
<!-- Reviewed: no Maintainer: Marqitos -->
<refentry xml:id="function.curl_upkeep" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
Expand Down Expand Up @@ -61,7 +61,7 @@ curl_setopt($ch, CURLOPT_HTTP_VERSION,CURL_HTTP_VERSION_2_0);
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($ch, CURLOPT_UPKEEP_INTERVAL_MS, 200);
if (curl_exec($ch)) {
usleep(300);
usleep(300000);
var_dump(curl_upkeep($ch));
}
?>
Expand Down
39 changes: 35 additions & 4 deletions reference/curl/functions/curl-version.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: fd45557ea6f38295f024de7e605c8a13dbf95f51 Maintainer: PhilDaiguille Status: ready -->
<!-- EN-Revision: fd34024b25c6fd07abe850e8b880d1d0f8b442a4 Maintainer: PhilDaiguille Status: ready -->
<!-- Reviewed: yes -->
<refentry xml:id="function.curl-version" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Expand Down Expand Up @@ -47,7 +47,7 @@
</row>
<row>
<entry>ssl_version_number</entry>
<entry>número de versión de OpenSSL de 24 bits</entry>
<entry>Siempre <literal>0</literal>, libcurl ya no lo define</entry>
</row>
<row>
<entry>ssl_version</entry>
Expand All @@ -63,7 +63,10 @@
</row>
<row>
<entry>age</entry>
<entry/>
<entry>
La edad de la información de versión devuelta por libcurl. Las versiones
más recientes de libcurl tienen una edad mayor
</entry>
</row>
<row>
<entry>features</entry>
Expand All @@ -80,6 +83,34 @@
son soportadas (&true;) o no (&false;).
</entry>
</row>
<row>
<entry>ares</entry>
<entry>versión de c-ares, en forma de string, o un string vacío si cURL se compiló sin c-ares</entry>
</row>
<row>
<entry>ares_num</entry>
<entry>número de versión de c-ares, o <literal>0</literal> si cURL se compiló sin c-ares</entry>
</row>
<row>
<entry>libidn</entry>
<entry>versión de libidn2, en forma de string, o un string vacío si cURL se compiló sin libidn2</entry>
</row>
<row>
<entry>iconv_ver_num</entry>
<entry>número de versión de iconv, o <literal>0</literal> si cURL se compiló sin iconv</entry>
</row>
<row>
<entry>libssh_version</entry>
<entry>nombre y versión de la biblioteca SSH, en forma de string, o un string vacío si cURL se compiló sin soporte para SSH</entry>
</row>
<row>
<entry>brotli_ver_num</entry>
<entry>número de versión de Brotli, o <literal>0</literal> si cURL se compiló sin Brotli</entry>
</row>
<row>
<entry>brotli_version</entry>
<entry>versión de Brotli, en forma de string, o un string vacío si cURL se compiló sin Brotli</entry>
</row>
</tbody>
</tgroup>
</informaltable>
Expand All @@ -100,7 +131,7 @@
<row>
<entry>8.4.0</entry>
<entry>
<literal>features_list</literal> añadido.
<literal>feature_list</literal> añadido.
</entry>
</row>
<row>
Expand Down
Loading