diff options
| author | Anatol Belski <ab@php.net> | 2015-10-13 10:29:26 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-10-13 10:29:26 +0200 |
| commit | 40142c084a28a6266b7b781778c74ee1b6133c95 (patch) | |
| tree | cc25c8ea6116fa03b0d4c599cdb9c50558847e1d /main | |
| parent | 417e58f332f8e1c5b56001f6e5ce67505c4e5997 (diff) | |
| parent | 7597a065623c4437ff29004d87a5d45f1bfe50fe (diff) | |
| download | php-git-40142c084a28a6266b7b781778c74ee1b6133c95.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.0.0
* PHP-7.0: (103 commits)
Add more tests for closure binding
Forbid "fake" closure rebinding
increase API versions
fork test for ICU 56.1
fork test for ICU-56.1
fix test for ICU-56.1
fix test
Double declaration
fix stack overflow
Generally run all tests in sapi folder by default
Fixed bug #70685
Normalize rebinding failures
Implemented file_cache_fallback mechanism
Improve previous fix
Fixed bug #70681
update NEWS
update NEWS
Fixed bug #70630 (Closure::call/bind() crash with ReflectionFunction->getClosure())
Fixed reference cuntmting for closures (previously we didn't increment reference counter for "internal" closures)
Fixed infinity recurion if we create closure on top of other closure.
...
Diffstat (limited to 'main')
| -rw-r--r-- | main/php.h | 2 | ||||
| -rw-r--r-- | main/php_ini.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/main/php.h b/main/php.h index 2a461377f4..90a230705a 100644 --- a/main/php.h +++ b/main/php.h @@ -26,7 +26,7 @@ #include <dmalloc.h> #endif -#define PHP_API_VERSION 20131218 +#define PHP_API_VERSION 20151012 #define PHP_HAVE_STREAMS #define YYDEBUG 0 #define PHP_DEFAULT_CHARSET "UTF-8" diff --git a/main/php_ini.c b/main/php_ini.c index 67434d6365..17d4e31aeb 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -421,7 +421,7 @@ int php_init_config(void) SetLastError(0); - /*If the given bugger is not large enough to hold the data, the return value is + /*If the given buffer is not large enough to hold the data, the return value is the buffer size, in characters, required to hold the string and its terminating null character. We use this return value to alloc the final buffer. */ size = GetEnvironmentVariableA("PHPRC", &dummybuf, 0); |