Compare commits

...
Author SHA1 Message Date
Ferenc Kovacs dae8ff251c 5.6.0alpha3 2014-02-27 02:36:56 +01:00
Ferenc Kovacs 79bfef5ba3 Merge branch 'PHP-5.6' into PHP-5.6.0
* PHP-5.6: (136 commits)
  fix tests broken by 633f898f15
  add missing NEWS entry
  add missing NEWS entry
  add missing NEWS entry
  add missing NEWS entry
  add missing NEWS entry
  add missing NEWS entry
  Deprecate CN_match in favor of peer_name in SSL contexts
  Remove cURL close policy related constants
  Update stack size in tests/func/010.phpt
  Don't add num_additional_args in SEND opcodes
  Disallow use of positional args after unpacking
  Store arg_num in fcall entry
  Introduce zend_function_call_entry structure
  move the default encoding NEWS entry to alpha3, as it was pushed after beta2 was tagged
  rearrange the NEWS blocks a bit
  add NEWS block for 5.6.0 beta1
  restored that test part in ext/openssl to enable notify/wait
  remove echo
  fix stdin reading in new openssl tests
  ...
2014-02-27 02:35:58 +01:00
Ferenc Kovacs 326ab8b147 5.6.0alpha2 2014-02-12 09:45:18 +01:00
Ferenc Kovacs 99bd2fd9c4 Merge branch 'PHP-5.6' into PHP-5.6.0
* PHP-5.6: (97 commits)
  update the alpha2 release date
  Fixed ZTS and added fix to NEWS.
  Implemented feature #45528: Allow the DateTimeZone constructor to accept timezones per offset too.
  Rename timelib_get_zone to timelib_parse_zone and export.
  fix regex to detect valgrind version New PCRE version got stricter
  fix regex to detect valgrind version New PCRE version got stricter
  Fixed memory leak in pow operator
  5.5.9 now released
  Added information in NEWS and UPGRADING
  add T_POW (**) operator
  add NEWS block for 5.6.0alpha3
  updated libs_version.txt
  updated libs_version.txt
  update libs_version.txt
  more tests for ICU >= 52.1 compat
  fix tests for ICU >= 52.1
  Fix year
  adapt test to curl 7.35.0 upgrade
  move the NEWS entry into the right section
  Fixed SNI failure from missing Z_STRVAL_PP
  ...
2014-02-12 06:43:05 +01:00
Ferenc Kovacs 1f148f7ad9 Revert "5.6.0alpha1"
This reverts commit 8648f76bac.
2014-02-06 03:55:53 +01:00
Ferenc Kovacs 8648f76bac 5.6.0alpha1 2014-01-21 02:30:07 +01: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=6
PHP_RELEASE_VERSION=0
PHP_EXTRA_VERSION="-dev"
PHP_EXTRA_VERSION="alpha3"
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 6
#define PHP_RELEASE_VERSION 0
#define PHP_EXTRA_VERSION "-dev"
#define PHP_VERSION "5.6.0-dev"
#define PHP_EXTRA_VERSION "alpha3"
#define PHP_VERSION "5.6.0alpha3"
#define PHP_VERSION_ID 50600