Skip to content
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.

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

LDAP: Fix the wrong parameter name serverctrls to controls #3270

Merged
merged 3 commits into from
Mar 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions appendices/migration73/new-features.xml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
<itemizedlist>
<listitem>
<simpara>
A <literal>$serverctrls</literal> parameter to send controls to the
A <literal>$controls</literal> parameter to send controls to the
server in <function>ldap_add</function>,
<function>ldap_mod_replace</function>, <function>ldap_mod_add</function>,
<function>ldap_mod_del</function>, <function>ldap_rename</function>,
Expand All @@ -144,7 +144,7 @@
</listitem>
<listitem>
<simpara>
The out parameter <literal>$serverctrls</literal> to get controls from the server in
The out parameter <literal>$controls</literal> to get controls from the server in
<function>ldap_parse_result</function> has been added.
</simpara>
</listitem>
Expand Down
4 changes: 2 additions & 2 deletions reference/ldap/controls.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ if (!in_array(LDAP_CONTROL_PAGEDRESULTS, ldap_get_entries($ds, $result)[0]['supp

<para>
As of PHP 7.3, you can send controls with your request in all
request functions using the serverctrls parameter. When a ext
request functions using the <parameter>controls</parameter> parameter. When a ext
version of a function exists, you should use it if you want to
get access to the full response object and be able to parse
response controls from it using <function>ldap_parse_result</function>.
</para>

<para>
serverctrls must be an array containing an array for each control to send,
<parameter>controls</parameter> must be an array containing an array for each control to send,
containing the following keys:
<variablelist>
<varlistentry>
Expand Down
2 changes: 1 addition & 1 deletion reference/ldap/functions/ldap-exop.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
<row>
<entry>7.3.0</entry>
<entry>
Support for <parameter>serverctrls</parameter> added
Support for <parameter>controls</parameter> added
</entry>
</row>
</tbody>
Expand Down
Loading