[PHP-CVS] com php-src: 5.4.5: NEWS configure.in main/php_version.h
Commit:86d7c5866fa6b9247c9ca0bb60d7aad63c1f4ee8 Author:Stanislav Malyshev s...@php.net Tue, 17 Jul 2012 23:19:16 -0700 Parents: a66b5c9a289f5bfc392e1fd9ae13981e84a465ac Branches: PHP-5.4.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=86d7c5866fa6b9247c9ca0bb60d7aad63c1f4ee8 Log: 5.4.5 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index c9b035b..bc43406 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,6 @@ PHPNEWS ||| -?? ??? 2012, PHP 5.4.5 - -05 Jul 2012, PHP 5.4.5 RC1 +19 Jul 2012, PHP 5.4.5 - Core: . Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed diff --git a/configure.in b/configure.in index 88752f6..8ca71a1 100644 --- a/configure.in +++ b/configure.in @@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=4 PHP_RELEASE_VERSION=5 -PHP_EXTRA_VERSION=RC1 +PHP_EXTRA_VERSION= PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` diff --git a/main/php_version.h b/main/php_version.h index 8354e12..7db820e 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 5 -#define PHP_EXTRA_VERSION RC1 -#define PHP_VERSION 5.4.5RC1 +#define PHP_EXTRA_VERSION +#define PHP_VERSION 5.4.5 #define PHP_VERSION_ID 50405 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Revert Fix bug #62112: number_format() is not binary safe: ext/standard/math.c ext/standard/tests/math/bug62112.phpt
Commit:a66b5c9a289f5bfc392e1fd9ae13981e84a465ac
Author:Stanislav Malyshev s...@php.net Tue, 17 Jul 2012 14:50:07
-0700
Parents: da4e5307b9e8c083182f6d0c09fd9b272dd38932
Branches: PHP-5.4.5
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=a66b5c9a289f5bfc392e1fd9ae13981e84a465ac
Log:
Revert Fix bug #62112: number_format() is not binary safe
This reverts commit 3e62aae1b456440328af4153524e22679b84f68a.
Bugs:
https://bugs.php.net/62112
Changed paths:
M ext/standard/math.c
D ext/standard/tests/math/bug62112.phpt
Diff:
diff --git a/ext/standard/math.c b/ext/standard/math.c
index b3e8c6f..65187f6 100644
--- a/ext/standard/math.c
+++ b/ext/standard/math.c
@@ -1097,9 +1097,7 @@ PHPAPI char *_php_math_number_format(double d, int dec,
char dec_point, char tho
return _php_math_number_format_ex(d, dec, dec_point, 1, thousand_sep,
1);
}
-static char *_php_math_number_format_ex_len(double d, int dec, char *dec_point,
- size_t dec_point_len, char *thousand_sep, size_t
thousand_sep_len,
- int *result_len)
+PHPAPI char *_php_math_number_format_ex(double d, int dec, char *dec_point,
size_t dec_point_len, char *thousand_sep, size_t thousand_sep_len)
{
char *tmpbuf = NULL, *resbuf;
char *s, *t; /* source, target */
@@ -1207,19 +1205,8 @@ static char *_php_math_number_format_ex_len(double d,
int dec, char *dec_point,
efree(tmpbuf);
- if (result_len) {
- *result_len = reslen;
- }
-
return resbuf;
}
-
-PHPAPI char *_php_math_number_format_ex(double d, int dec, char *dec_point,
- size_t dec_point_len, char *thousand_sep, size_t
thousand_sep_len)
-{
- return _php_math_number_format_ex_len(d, dec, dec_point, dec_point_len,
- thousand_sep, thousand_sep_len, NULL);
-}
/* }}} */
/* {{{ proto string number_format(float number [, int num_decimal_places [,
string dec_seperator, string thousands_seperator]])
@@ -1254,10 +1241,7 @@ PHP_FUNCTION(number_format)
thousand_sep_len = 1;
}
- Z_TYPE_P(return_value) = IS_STRING;
- Z_STRVAL_P(return_value) = _php_math_number_format_ex_len(num,
dec,
- dec_point, dec_point_len, thousand_sep,
thousand_sep_len,
- Z_STRLEN_P(return_value));
+ RETURN_STRING(_php_math_number_format_ex(num, dec, dec_point,
dec_point_len, thousand_sep, thousand_sep_len), 0);
break;
default:
WRONG_PARAM_COUNT;
diff --git a/ext/standard/tests/math/bug62112.phpt
b/ext/standard/tests/math/bug62112.phpt
deleted file mode 100644
index 01de35a..000
Binary files a/ext/standard/tests/math/bug62112.phpt and /dev/null differ
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] tag php-src: create tag php-5.4.5
Tag php-5.4.5 in php-src.git was created Tag: 021b47dcf85d02958940a14c93c6c470109a147d Tagger: Stanislav Malyshevs...@php.net Tue Jul 17 23:50:39 2012 -0700 Log: 5.4.5 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (Darwin) iF4EABEIAAYFAlAGXMIACgkQL3lWvF2gS11sjQD/Xk9nKTuHjU/jp0Hdz3lz+WzI hm5wVp08CMD4kgLfz4cA/RaGRlOM4IafI7MRRhrS2yMSGXwlWS8TV3nyCqetq0nA =rx8U -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=021b47dcf85d02958940a14c93c6c470109a147d Target: 86d7c5866fa6b9247c9ca0bb60d7aad63c1f4ee8 Author: Stanislav Malyshev s...@php.net Tue, 17 Jul 2012 23:19:16 -0700 Parents: a66b5c9a289f5bfc392e1fd9ae13981e84a465ac Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=86d7c5866fa6b9247c9ca0bb60d7aad63c1f4ee8 Target log: 5.4.5 Changed paths: M NEWS M configure.in M main/php_version.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Bug doesn't exists in any release: NEWS
Commit:c7c939b5d8b2a8e2d7d72bf83c031005e93cd3fe Author:Xinchen Hui larue...@php.net Wed, 18 Jul 2012 18:00:09 +0800 Parents: c7614a8c19d5d1f366ec219e745760ea2133e5a0 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c7c939b5d8b2a8e2d7d72bf83c031005e93cd3fe Log: Bug doesn't exists in any release Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 8dc740c..9da5717 100644 --- a/NEWS +++ b/NEWS @@ -3,8 +3,6 @@ PHP NEWS ?? ??? 2012, PHP 5.4.6 - Core: - . Fixed bug in number_format() when the number was not finite. See pull -request #134. (Reeze Xia) . Fixed bug #62565 (Crashes due non-initialized internal properties_table). (Felipe) @@ -17,7 +15,7 @@ PHP NEWS - Fileinfo: . Fixed bug #61964 (finfo_open with directory causes invalid free). - (reeze@gmail.com) +(reeze@gmail.com) - Intl: . Fixed bug #62564 (Extending MessageFormatter and adding property causes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: fix test: ext/curl/tests/curl_escape.phpt
Commit:cea3f0f3635179c052ba2d13d889a82b5a327ddb Author:Xinchen Hui larue...@php.net Wed, 18 Jul 2012 18:50:42 +0800 Parents: 2e325d612637605b8fada38b665f5bf49ab55b5a Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cea3f0f3635179c052ba2d13d889a82b5a327ddb Log: fix test All input characters that are not a-z, A-Z or 0-9 will be converted to their URL escaped version see http://curl.haxx.se/libcurl/c/curl_escape.html Changed paths: M ext/curl/tests/curl_escape.phpt Diff: diff --git a/ext/curl/tests/curl_escape.phpt b/ext/curl/tests/curl_escape.phpt index 7c90fb9..9a11e61 100644 Binary files a/ext/curl/tests/curl_escape.phpt and b/ext/curl/tests/curl_escape.phpt differ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode): NEWS ext/mysqlnd/mysqlnd_debug.c
Commit:25be12a3bcd4a56a094d28b73cdc5cee68970bf3
Author:Xinchen Hui larue...@php.net Wed, 18 Jul 2012 19:06:27
+0800
Parents: c7c939b5d8b2a8e2d7d72bf83c031005e93cd3fe
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=25be12a3bcd4a56a094d28b73cdc5cee68970bf3
Log:
Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode)
Bugs:
https://bugs.php.net/62594
Changed paths:
M NEWS
M ext/mysqlnd/mysqlnd_debug.c
Diff:
diff --git a/NEWS b/NEWS
index 9da5717..280eb1f 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,9 @@ PHP
NEWS
. Fixed bug #62564 (Extending MessageFormatter and adding property causes
crash). (Felipe)
+- MySQLnd:
+ . Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode). (Laruence)
+
- Reflection:
. Implemented FR #61602 (Allow access to name of constant used as default
value). (reeze@gmail.com)
diff --git a/ext/mysqlnd/mysqlnd_debug.c b/ext/mysqlnd/mysqlnd_debug.c
index 5c77b42..044a7d6 100644
--- a/ext/mysqlnd/mysqlnd_debug.c
+++ b/ext/mysqlnd/mysqlnd_debug.c
@@ -516,9 +516,11 @@ enum mysqlnd_debug_parser_state
static void
MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char *
const mode)
{
- unsigned int mode_len = strlen(mode), i;
+ unsigned int mode_len, i;
enum mysqlnd_debug_parser_state state = PARSER_WAIT_MODIFIER;
+ mode_len = mode? strlen(mode) : 0;
+
self-flags = 0;
self-nest_level_limit = 0;
if (self-file_name self-file_name !=
mysqlnd_debug_default_trace_file) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4': ext/mysqlnd/mysqlnd_debug.c
Commit:f13288de96b9cc064b976a384fad73a191891721 Author:Xinchen Hui larue...@php.net Wed, 18 Jul 2012 19:06:58 +0800 Parents: cea3f0f3635179c052ba2d13d889a82b5a327ddb 25be12a3bcd4a56a094d28b73cdc5cee68970bf3 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f13288de96b9cc064b976a384fad73a191891721 Log: Merge branch 'PHP-5.4' * PHP-5.4: Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode) Bugs: https://bugs.php.net/62594 Changed paths: MM ext/mysqlnd/mysqlnd_debug.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: test script for bug #61697: ext/spl/tests/bug61697.phpt
Commit:8238c6a4c815220045322ac3c524b98613639f97
Author:Xinchen Hui larue...@php.net Wed, 18 Jul 2012 19:19:31
+0800
Parents: f13288de96b9cc064b976a384fad73a191891721
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=8238c6a4c815220045322ac3c524b98613639f97
Log:
test script for bug #61697
Bugs:
https://bugs.php.net/61697
Changed paths:
A ext/spl/tests/bug61697.phpt
Diff:
diff --git a/ext/spl/tests/bug61697.phpt b/ext/spl/tests/bug61697.phpt
new file mode 100644
index 000..d95caef
--- /dev/null
+++ b/ext/spl/tests/bug61697.phpt
@@ -0,0 +1,26 @@
+--TEST--
+Bug #61697 (spl_autoload_functions returns lambda functions incorrectly)
+--XFAIL--
+Bug #61697 not fixed yet
+--FILE--
+?php
+
+function f1($class) { echo f1: [[$class]]\n; }
+function f2($class) { echo f2: [[$class]]\n; }
+
+spl_autoload_register('f1');
+spl_autoload_register('f2');
+spl_autoload_register(create_function('$class', 'echo cf1: [[$class]]\n;'));
+spl_autoload_register(create_function('$class', 'echo cf2: [[$class]]\n;'));
+
+foreach (spl_autoload_functions() AS $func)
+{
+spl_autoload_unregister($func);
+}
+
+print_r(spl_autoload_functions());
+?
+--EXPECTF--
+Array
+(
+)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] 回复： [PHP-CVS] com php-src: Bug doesn't exists in any release: NEWS
-- Reeze Sent with sparrow 在 2012年7月18日星期三，18:00，Xinchen Hui 写道： Commit: c7c939b5d8b2a8e2d7d72bf83c031005e93cd3fe Author: Xinchen Hui larue...@php.net Wed, 18 Jul 2012 18:00:09 +0800 Parents: c7614a8c19d5d1f366ec219e745760ea2133e5a0 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c7c939b5d8b2a8e2d7d72bf83c031005e93cd3fe Log: Bug doesn't exists in any release Changed paths: M NEWS The fix for number_format()'s binary safty is reverted only in 5.4.5 branch https://github.com/php/php-src/commits/PHP-5.4.5 Diff: diff --git a/NEWS b/NEWS index 8dc740c..9da5717 100644 --- a/NEWS +++ b/NEWS @@ -3,8 +3,6 @@ PHP NEWS ?? ??? 2012, PHP 5.4.6 - Core: - . Fixed bug in number_format() when the number was not finite. See pull - request #134. (Reeze Xia) . Fixed bug #62565 (Crashes due non-initialized internal properties_table). (Felipe) @@ -17,7 +15,7 @@ PHP NEWS - Fileinfo: . Fixed bug #61964 (finfo_open with directory causes invalid free). - (reeze@gmail.com) + (reeze@gmail.com) - Intl: . Fixed bug #62564 (Extending MessageFormatter and adding property causes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: fix test, the key may be a float value: ext/standard/tests/file/realpath_cache.phpt
Commit:41a9c681a0a8b27ab121d2a4649fccd16c97cadd
Author:Xinchen Hui larue...@php.net Wed, 18 Jul 2012 19:21:25
+0800
Parents: 25be12a3bcd4a56a094d28b73cdc5cee68970bf3
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=41a9c681a0a8b27ab121d2a4649fccd16c97cadd
Log:
fix test, the key may be a float value
Changed paths:
M ext/standard/tests/file/realpath_cache.phpt
Diff:
diff --git a/ext/standard/tests/file/realpath_cache.phpt
b/ext/standard/tests/file/realpath_cache.phpt
index 92d6fc5..2dac21e 100644
--- a/ext/standard/tests/file/realpath_cache.phpt
+++ b/ext/standard/tests/file/realpath_cache.phpt
@@ -19,7 +19,7 @@ echo Done\n;
int(%d)
array(4) {
[key]=
- %s(%d)
+ %s(%s)
[is_dir]=
bool(true)
[realpath]=
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: fix test (dos2unix, typo): ext/standard/tests/general_functions/uniqid_basic.phpt
Commit:282a6659aab94133bb9f95148b2540018333a8ca
Author:Xinchen Hui larue...@php.net Wed, 18 Jul 2012 19:25:22
+0800
Parents: 41a9c681a0a8b27ab121d2a4649fccd16c97cadd
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=282a6659aab94133bb9f95148b2540018333a8ca
Log:
fix test (dos2unix, typo)
Changed paths:
M ext/standard/tests/general_functions/uniqid_basic.phpt
Diff:
diff --git a/ext/standard/tests/general_functions/uniqid_basic.phpt
b/ext/standard/tests/general_functions/uniqid_basic.phpt
index 9a9c573..2da832b 100644
--- a/ext/standard/tests/general_functions/uniqid_basic.phpt
+++ b/ext/standard/tests/general_functions/uniqid_basic.phpt
@@ -1,73 +1,72 @@
---TEST--
-Test uniqid() function : basic functionality
---FILE--
-?php
-/* Prototype : string uniqid ([ string $prefix= [, bool $more_entropy=
false ]] )
- * Description: Gets a prefixed unique identifier based on the current time in
microseconds.
- * Source code: ext/standard/uniqid.c
-*/
-echo *** Testing uniqid() : basic functionality ***\n;
-
-echo \nuniqid() without a prefix\n;
-var_dump(uniqid());
-var_dump(uniqid(null, true));
-var_dump(uniqid(null, false));
-echo \n\n;
-
-echo uniqid() with a prefix\n;
-
-// Use a fixed prefix so we can ensure length of o/p id is fixed
-$prefix = array (
- 9,
- 9,
- 10.5e2,
- null,
- true,
- false
- );
-
-for ($i = 0; $i count($prefix); $i++) {
- var_dump(uniqid($prefix[$i]));
- var_dump(uniqid($prefix[$i], true));
- var_dump(uniqid($prefix[$i], false));
- echo \n;
-}
-
-?
-===DONE===
---EXPECTF--
-*** Testing uniqid() : basic functionality ***
-
-uniqid() without a prefix
-string(13) %s
-string(23) %s.%s
-string(13) %s
-
-
-uniqid() with a prefix
-string(18) 9%s
-string(28) 9%s.%s
-string(18) 9%s
-
-string(18) 94%s
-string(28) 94%s.%s
-string(18) 94%s
-
-string(17) 1050%s
-string(27) 1050%s.%s
-string(17) 1050%s
-
-string(13) %s
-string(23) %s.%s
-string(13) %s
-
-string(14) 1%s
-string(24) 1%s.%s
-string(14) 1%s
-
-string(13) %s
-string(23) %s.%s
-string(13) %s
-
-===DONE===
-
\ No newline at end of file
+--TEST--
+Test uniqid() function : basic functionality
+--FILE--
+?php
+/* Prototype : string uniqid ([ string $prefix= [, bool $more_entropy=
false ]] )
+ * Description: Gets a prefixed unique identifier based on the current time in
microseconds.
+ * Source code: ext/standard/uniqid.c
+*/
+echo *** Testing uniqid() : basic functionality ***\n;
+
+echo \nuniqid() without a prefix\n;
+var_dump(uniqid());
+var_dump(uniqid(null, true));
+var_dump(uniqid(null, false));
+echo \n\n;
+
+echo uniqid() with a prefix\n;
+
+// Use a fixed prefix so we can ensure length of o/p id is fixed
+$prefix = array (
+ 9,
+ 9,
+ 10.5e2,
+ null,
+ true,
+ false
+ );
+
+for ($i = 0; $i count($prefix); $i++) {
+ var_dump(uniqid($prefix[$i]));
+ var_dump(uniqid($prefix[$i], true));
+ var_dump(uniqid($prefix[$i], false));
+ echo \n;
+}
+
+?
+===DONE===
+--EXPECTF--
+*** Testing uniqid() : basic functionality ***
+
+uniqid() without a prefix
+string(13) %s
+string(23) %s.%s
+string(13) %s
+
+
+uniqid() with a prefix
+string(18) 9%s
+string(28) 9%s.%s
+string(18) 9%s
+
+string(18) 9%s
+string(28) 9%s.%s
+string(18) 9%s
+
+string(17) 1050%s
+string(27) 1050%s.%s
+string(17) 1050%s
+
+string(13) %s
+string(23) %s.%s
+string(13) %s
+
+string(14) 1%s
+string(24) 1%s.%s
+string(14) 1%s
+
+string(13) %s
+string(23) %s.%s
+string(13) %s
+
+===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] 回复： [PHP-CVS] com php-src: Bug doesn't exists in any release: NEWS
-- Reeze Sent with sparrow 在 2012年7月18日星期三，19:20，Reeze 写道： -- Reeze Sent with sparrow 在 2012年7月18日星期三，18:00，Xinchen Hui 写道： Commit: c7c939b5d8b2a8e2d7d72bf83c031005e93cd3fe Author: Xinchen Hui larue...@php.net Wed, 18 Jul 2012 18:00:09 +0800 Parents: c7614a8c19d5d1f366ec219e745760ea2133e5a0 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c7c939b5d8b2a8e2d7d72bf83c031005e93cd3fe Log: Bug doesn't exists in any release Changed paths: M NEWS The fix for number_format()'s binary safty is reverted only in 5.4.5 branch https://github.com/php/php-src/commits/PHP-5.4.5 Diff: diff --git a/NEWS b/NEWS index 8dc740c..9da5717 100644 --- a/NEWS +++ b/NEWS @@ -3,8 +3,6 @@ PHP NEWS ?? ??? 2012, PHP 5.4.6 - Core: - . Fixed bug in number_format() when the number was not finite. See pull - request #134. (Reeze Xia) . Fixed bug #62565 (Crashes due non-initialized internal properties_table). (Felipe) @@ -17,7 +15,7 @@ PHP NEWS - Fileinfo: . Fixed bug #61964 (finfo_open with directory causes invalid free). - (reeze@gmail.com) + (reeze@gmail.com) - Intl: . Fixed bug #62564 (Extending MessageFormatter and adding property causes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php Ah you mean release. 5.4.5 is the latest version. ignore me
[PHP-CVS] com php-src: Fix test (no charset outputed): sapi/cgi/tests/apache_request_headers.phpt
Commit:8f89cfb548a733ec0d8004920be7d2e7e3cfe107 Author:Xinchen Hui larue...@php.net Wed, 18 Jul 2012 19:50:30 +0800 Parents: 11d05589282a7f9c795a0af77dcd2b3cc0a158ce Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8f89cfb548a733ec0d8004920be7d2e7e3cfe107 Log: Fix test (no charset outputed) Changed paths: M sapi/cgi/tests/apache_request_headers.phpt Diff: diff --git a/sapi/cgi/tests/apache_request_headers.phpt b/sapi/cgi/tests/apache_request_headers.phpt index 3dc3580..881b6bb 100644 --- a/sapi/cgi/tests/apache_request_headers.phpt +++ b/sapi/cgi/tests/apache_request_headers.phpt @@ -31,7 +31,7 @@ echo Done\n; ? --EXPECTF-- X-Powered-By: PHP/%s -Content-type: text/html; charset=UTF-8 +Content-type: text/%s Array ( -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build): NEWS ext/standard/file.c
Commit:2d9d2cadadf0fdf12a01b4a689d0554e1450904f Author:Xinchen Hui larue...@php.net Wed, 18 Jul 2012 20:16:27 +0800 Parents: 8f89cfb548a733ec0d8004920be7d2e7e3cfe107 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2d9d2cadadf0fdf12a01b4a689d0554e1450904f Log: Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build) Bugs: https://bugs.php.net/62597 Changed paths: M NEWS M ext/standard/file.c Diff: diff --git a/NEWS b/NEWS index 280eb1f..34b48d9 100644 --- a/NEWS +++ b/NEWS @@ -35,6 +35,10 @@ PHP NEWS . Fixed bug #61527 (ArrayIterator gives misleading notice on next() when moved to the end). (reeze@gmail.com) +- Streams: + . Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build). +(Laruence) + ?? ??? 2012, PHP 5.4.5 - Core: diff --git a/ext/standard/file.c b/ext/standard/file.c index 7d01d31..cce0143 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -161,6 +161,7 @@ static void file_globals_ctor(php_file_globals *file_globals_p TSRMLS_DC) FG(pclose_ret) = 0; FG(user_stream_current_filename) = NULL; FG(def_chunk_size) = PHP_SOCK_CHUNK_SIZE; + FG(wrapper_errors) = NULL; } static void file_globals_dtor(php_file_globals *file_globals_p TSRMLS_DC) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4': ext/standard/file.c
Commit:e7535e06e63104ccc0c90c4425b6c2541aa3c939 Author:Xinchen Hui larue...@php.net Wed, 18 Jul 2012 20:17:42 +0800 Parents: 401230c7e181d97e9a8bf1abeeb294341c98727b 2d9d2cadadf0fdf12a01b4a689d0554e1450904f Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e7535e06e63104ccc0c90c4425b6c2541aa3c939 Log: Merge branch 'PHP-5.4' * PHP-5.4: Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build) Bugs: https://bugs.php.net/62597 Changed paths: MM ext/standard/file.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: this initialization is unnecessary anymore after commit 2d9d2cadadf0fdf12a01b4a689d0554e1450904f: ext/standard/basic_functions.c
Commit:b81b8bf77d75d719a9785f71796e56ad2b676147
Author:Xinchen Hui larue...@php.net Wed, 18 Jul 2012 21:45:37
+0800
Parents: 2d9d2cadadf0fdf12a01b4a689d0554e1450904f
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=b81b8bf77d75d719a9785f71796e56ad2b676147
Log:
this initialization is unnecessary anymore after commit
2d9d2cadadf0fdf12a01b4a689d0554e1450904f
Changed paths:
M ext/standard/basic_functions.c
Diff:
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index a5637db..e6de34e 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -3719,8 +3719,6 @@ PHP_RINIT_FUNCTION(basic) /* {{{ */
/* Default to global filters only */
FG(stream_filters) = NULL;
- FG(wrapper_errors) = NULL;
-
return SUCCESS;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4': ext/standard/basic_functions.c
Commit:da7cd966ffb2e3c5534f2eb5ba7068a17658f23f Author:Xinchen Hui larue...@php.net Wed, 18 Jul 2012 21:49:46 +0800 Parents: e7535e06e63104ccc0c90c4425b6c2541aa3c939 b81b8bf77d75d719a9785f71796e56ad2b676147 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=da7cd966ffb2e3c5534f2eb5ba7068a17658f23f Log: Merge branch 'PHP-5.4' * PHP-5.4: this initialization is unnecessary anymore after commit 2d9d2cadadf0fdf12a01b4a689d0554e1450904f Changed paths: MM ext/standard/basic_functions.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Revert fix test: ext/curl/tests/curl_escape.phpt
Commit:94a0f8722b1f480f2cd8c0fc044cff40f2418607 Author:Xinchen Hui larue...@php.net Wed, 18 Jul 2012 22:35:03 +0800 Parents: da7cd966ffb2e3c5534f2eb5ba7068a17658f23f Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=94a0f8722b1f480f2cd8c0fc044cff40f2418607 Log: Revert fix test This reverts commit cea3f0f3635179c052ba2d13d889a82b5a327ddb. seems the behavior is different between certain versions Changed paths: M ext/curl/tests/curl_escape.phpt Diff: diff --git a/ext/curl/tests/curl_escape.phpt b/ext/curl/tests/curl_escape.phpt index 9a11e61..7c90fb9 100644 Binary files a/ext/curl/tests/curl_escape.phpt and b/ext/curl/tests/curl_escape.phpt differ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Revert Fix bug #62112: number_format() is not binary safe: ext/standard/math.c ext/standard/tests/math/bug62112.phpt
Shouldn't the ticket be reopened then?
-Hannes
On Tue, Jul 17, 2012 at 10:50 PM, Stanislav Malyshev s...@php.net wrote:
Commit:a66b5c9a289f5bfc392e1fd9ae13981e84a465ac
Author:Stanislav Malyshev s...@php.net Tue, 17 Jul 2012
14:50:07 -0700
Parents: da4e5307b9e8c083182f6d0c09fd9b272dd38932
Branches: PHP-5.4.5
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=a66b5c9a289f5bfc392e1fd9ae13981e84a465ac
Log:
Revert Fix bug #62112: number_format() is not binary safe
This reverts commit 3e62aae1b456440328af4153524e22679b84f68a.
Bugs:
https://bugs.php.net/62112
Changed paths:
M ext/standard/math.c
D ext/standard/tests/math/bug62112.phpt
Diff:
diff --git a/ext/standard/math.c b/ext/standard/math.c
index b3e8c6f..65187f6 100644
--- a/ext/standard/math.c
+++ b/ext/standard/math.c
@@ -1097,9 +1097,7 @@ PHPAPI char *_php_math_number_format(double d, int dec,
char dec_point, char tho
return _php_math_number_format_ex(d, dec, dec_point, 1,
thousand_sep, 1);
}
-static char *_php_math_number_format_ex_len(double d, int dec, char
*dec_point,
- size_t dec_point_len, char *thousand_sep, size_t
thousand_sep_len,
- int *result_len)
+PHPAPI char *_php_math_number_format_ex(double d, int dec, char *dec_point,
size_t dec_point_len, char *thousand_sep, size_t thousand_sep_len)
{
char *tmpbuf = NULL, *resbuf;
char *s, *t; /* source, target */
@@ -1207,19 +1205,8 @@ static char *_php_math_number_format_ex_len(double d,
int dec, char *dec_point,
efree(tmpbuf);
- if (result_len) {
- *result_len = reslen;
- }
-
return resbuf;
}
-
-PHPAPI char *_php_math_number_format_ex(double d, int dec, char *dec_point,
- size_t dec_point_len, char *thousand_sep, size_t
thousand_sep_len)
-{
- return _php_math_number_format_ex_len(d, dec, dec_point,
dec_point_len,
- thousand_sep, thousand_sep_len, NULL);
-}
/* }}} */
/* {{{ proto string number_format(float number [, int num_decimal_places [,
string dec_seperator, string thousands_seperator]])
@@ -1254,10 +1241,7 @@ PHP_FUNCTION(number_format)
thousand_sep_len = 1;
}
- Z_TYPE_P(return_value) = IS_STRING;
- Z_STRVAL_P(return_value) =
_php_math_number_format_ex_len(num, dec,
- dec_point, dec_point_len, thousand_sep,
thousand_sep_len,
- Z_STRLEN_P(return_value));
+ RETURN_STRING(_php_math_number_format_ex(num, dec, dec_point,
dec_point_len, thousand_sep, thousand_sep_len), 0);
break;
default:
WRONG_PARAM_COUNT;
diff --git a/ext/standard/tests/math/bug62112.phpt
b/ext/standard/tests/math/bug62112.phpt
deleted file mode 100644
index 01de35a..000
Binary files a/ext/standard/tests/math/bug62112.phpt and /dev/null differ
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
philip Wed, 18 Jul 2012 18:14:37 + Revision: http://svn.php.net/viewvc?view=revisionrevision=326692 Log: phpdoc karma for Sherif Ramadan (googleguy) Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail 2012-07-18 17:17:09 UTC (rev 326691) +++ SVNROOT/global_avail 2012-07-18 18:14:37 UTC (rev 326692) @@ -53,7 +53,7 @@ # The PHP Documentation Group maintains the documentation and its # translations.
Re: [PHP-CVS] com php-src: Revert Fix bug #62112: number_format() is not binary safe: ext/standard/math.c ext/standard/tests/math/bug62112.phpt
Hi! Shouldn't the ticket be reopened then? The revert is only for release version, 5.4 branch still has it fixed. -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
