diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /main/php_ini.c | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'main/php_ini.c')
| -rw-r--r-- | main/php_ini.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/php_ini.c b/main/php_ini.c index ebdf526e96..45e27e844a 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -420,8 +420,8 @@ int php_init_config(void) SetLastError(0); - /*If the given bugger 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 + /*If the given bugger 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); if (GetLastError() == ERROR_ENVVAR_NOT_FOUND) { |