Compare commits

...
Author SHA1 Message Date
Stanislav Malyshev 86aa35b787 5.4.43 2015-07-07 15:08:15 -07:00
Stanislav Malyshev e4fc1d5d1d Merge branch 'PHP-5.4' into PHP-5.4.43
* 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
2015-07-07 15:05:35 -07:00
Stanislav Malyshev a46bae2df2 Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) 2015-07-05 00:00:53 -07:00
Stanislav Malyshev 3e88d610e5 Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath 2015-07-04 23:47:48 -07:00
Stanislav Malyshev 452d30cf7d Fix bug #69958 - Segfault in Phar::convertToData on invalid file 2015-07-04 21:01:50 -07:00
2 changed files with 3 additions and 3 deletions

No files matched your search

+1 -1
View File
@@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=4
PHP_RELEASE_VERSION=43
PHP_EXTRA_VERSION="-dev"
PHP_EXTRA_VERSION=""
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
+2 -2
View File
@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 4
#define PHP_RELEASE_VERSION 43
#define PHP_EXTRA_VERSION "-dev"
#define PHP_VERSION "5.4.43-dev"
#define PHP_EXTRA_VERSION ""
#define PHP_VERSION "5.4.43"
#define PHP_VERSION_ID 50443