Skip to content

Commit 6c5814d

Browse files
committed
revert base64_encode change
1 parent 9fae55f commit 6c5814d

File tree

7 files changed

+30
-49
lines changed

7 files changed

+30
-49
lines changed

NEWS

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ PHP NEWS
221221
. Added the http_get_last_response_headers() and
222222
http_clear_last_response_headers() that allows retrieving the same content
223223
as the magic $http_response_header variable.
224-
. Add padding option to base64_encode. (Remi)
224+
. Add php_base64_encode_ex() API. (Remi)
225225

226226
- XML:
227227
. Added XML_OPTION_PARSE_HUGE parser option. (nielsdos)

UPGRADING

-2
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,6 @@ PHP 8.4 UPGRADE NOTES
136136
PHP_ROUND_HALF_UP.
137137
. strcspn() with empty $characters now returns the length of the string instead
138138
of incorrectly stopping at the first NUL character. See GH-12592.
139-
. base64_encode now have a $padding option (true by default) to allow
140-
encoding without the padding character '='.
141139

142140
- XML:
143141
. The xml_set_*_handler() functions now declare and check for an effective

UPGRADING.INTERNALS

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ PHP 8.4 INTERNALS UPGRADE NOTES
213213
pcre2_set_compile_extra_options() with those options.
214214

215215
g. ext/standard
216-
- Added the base64_encode_ex() API with flag parameters, value can be
216+
- Added the php_base64_encode_ex() API with flag parameters, value can be
217217
PHP_BASE64_NO_PADDING to encode without the padding character '='.
218218

219219
========================

ext/standard/base64.c

+2-5
Original file line numberDiff line numberDiff line change
@@ -1233,15 +1233,12 @@ PHP_FUNCTION(base64_encode)
12331233
char *str;
12341234
size_t str_len;
12351235
zend_string *result;
1236-
bool padding = true;
12371236

1238-
ZEND_PARSE_PARAMETERS_START(1, 2)
1237+
ZEND_PARSE_PARAMETERS_START(1, 1)
12391238
Z_PARAM_STRING(str, str_len)
1240-
Z_PARAM_OPTIONAL
1241-
Z_PARAM_BOOL(padding)
12421239
ZEND_PARSE_PARAMETERS_END();
12431240

1244-
result = php_base64_encode_ex((unsigned char*)str, str_len, (padding ? 0 : PHP_BASE64_NO_PADDING));
1241+
result = php_base64_encode((unsigned char*)str, str_len);
12451242
RETURN_STR(result);
12461243
}
12471244
/* }}} */

ext/standard/basic_functions.stub.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1930,7 +1930,7 @@ function array_is_list(array $array): bool {}
19301930
* @compile-time-eval
19311931
* @refcount 1
19321932
*/
1933-
function base64_encode(string $string, bool $padding = true): string {}
1933+
function base64_encode(string $string): string {}
19341934

19351935
/**
19361936
* @compile-time-eval

ext/standard/basic_functions_arginfo.h

+25-28
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ext/standard/tests/url/base64_encode_basic_001.phpt

-11
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ $values = array(
2929
foreach($values as $str) {
3030
$enc = base64_encode($str);
3131
printf("%s\n", $enc);
32-
$enc = base64_encode($str, padding: false);
33-
printf("%s\n", $enc);
3432
}
3533

3634
echo "Done\n";
@@ -294,21 +292,12 @@ echo "Done\n";
294292
0xFE: /g==
295293
0xFF: /w==
296294
SGVsbG8gV29ybGQ=
297-
SGVsbG8gV29ybGQ
298295
QUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVoxMjM0NTY3ODkwISVeJiooKXt9W10=
299-
QUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVoxMjM0NTY3ODkwISVeJiooKXt9W10
300-
CgkgTGluZSB3aXRoIGNvbnRyb2wgY2hhcmFjdGVycw0K
301296
CgkgTGluZSB3aXRoIGNvbnRyb2wgY2hhcmFjdGVycw0K
302297
wcLDxMXG
303-
wcLDxMXG
304298
PT4/BzgHOVw4MA==
305-
PT4/BzgHOVw4MA
306299
QUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVphYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ejAxMjM0NTY3ODklIQ==
307-
QUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVphYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ejAxMjM0NTY3ODklIQ
308300
QUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVphYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ejAxMjM0NTY3ODklIT0+Pwc4BzlcODA=
309-
QUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVphYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ejAxMjM0NTY3ODklIT0+Pwc4BzlcODA
310301
QUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVphYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ejAxMjM0NTY3ODklIUFCQ0RFRkdISUpLTE1OT1BRUlNUVVZXWFlaYWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXowMTIzNDU2Nzg5JSE=
311-
QUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVphYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ejAxMjM0NTY3ODklIUFCQ0RFRkdISUpLTE1OT1BRUlNUVVZXWFlaYWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXowMTIzNDU2Nzg5JSE
312-
QUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVphYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ejAxMjM0NTY3ODklIUFCQ0RFRkdISUpLTE1OT1BRUlNUVVZXWFlaYWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXowMTIzNDU2Nzg5JSE9Pj8HOAc5XDgw
313302
QUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVphYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ejAxMjM0NTY3ODklIUFCQ0RFRkdISUpLTE1OT1BRUlNUVVZXWFlaYWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXowMTIzNDU2Nzg5JSE9Pj8HOAc5XDgw
314303
Done

0 commit comments

Comments
 (0)