delta/php-git.git, branch php-5.4.43 git.php.net: repository/php-src.git 5.4.43 2015-07-07T22:08:15+00:00 Stanislav Malyshev stas@php.net 2015-07-07T22:08:15+00:00 86aa35b787caa8a28ae0a87e13cd4409c1034fe9 






Merge branch 'PHP-5.4' into PHP-5.4.43
2015-07-07T22:05:35+00:00

Stanislav Malyshev
stas@php.net

2015-07-07T22:05:35+00:00

e4fc1d5d1db500c67ba6ce2e0916baeec1f1859e

* PHP-5.4:
  Better fix for bug #69958
  update news
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file
  add missing second argument for ucfirst to the proto

Conflicts:
	ext/mysqlnd/mysqlnd.c
	ext/phar/phar_object.c
	ext/phar/tests/bug69958.phpt





* PHP-5.4:
  Better fix for bug #69958
  update news
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file
  add missing second argument for ucfirst to the proto

Conflicts:
	ext/mysqlnd/mysqlnd.c
	ext/phar/phar_object.c
	ext/phar/tests/bug69958.phpt







Better fix for bug #69958
2015-07-07T16:38:31+00:00

Stanislav Malyshev
stas@php.net

2015-07-07T05:58:28+00:00

885edfef0a0eb1016a906d197399f92375a795e4












update news
2015-07-07T16:38:31+00:00

Stanislav Malyshev
stas@php.net

2015-07-07T04:19:42+00:00

c8157619efca850889aa5aad7ca9ef32a6b4a08d












Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
2015-07-07T16:38:31+00:00

Stanislav Malyshev
stas@php.net

2015-07-05T07:00:53+00:00

97aa752fee61fccdec361279adbfb17a3c60f3f4












Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
2015-07-07T16:38:31+00:00

Stanislav Malyshev
stas@php.net

2015-07-05T06:47:48+00:00

6dedeb40db13971af45276f80b5375030aa7e76f












Fix bug #69958 - Segfault in Phar::convertToData on invalid file
2015-07-07T16:38:30+00:00

Stanislav Malyshev
stas@php.net

2015-07-05T04:01:50+00:00

bf58162ddf970f63502837f366930e44d6a992cf












add missing second argument for ucfirst to the proto
2015-07-07T13:48:55+00:00

Ferenc Kovacs
tyrael@php.net

2015-07-07T13:48:55+00:00

29533ae528af6ddf2ea93228721e75c6b94370fc












Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
2015-07-05T07:00:53+00:00

Stanislav Malyshev
stas@php.net

2015-07-05T07:00:53+00:00

a46bae2df257ec9bbc601204c73a8f7b103edee1












Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
2015-07-05T06:47:48+00:00

Stanislav Malyshev
stas@php.net

2015-07-05T06:47:48+00:00

3e88d610e54dac75a374af9e8501f02da67e4466