diff options
| -rw-r--r-- | NEWS | 14 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | ext/standard/exec.c | 2 | ||||
| -rw-r--r-- | main/php_version.h | 4 |
5 files changed, 10 insertions, 14 deletions
@@ -1,14 +1,6 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -11 Apr 2012, PHP 5.4.1 RC2 - -- Core: - . Fixed crash in ZTS using same class in many threads. (Johannes) - -- fileinfo: - . Fix fileinfo test problems. (Anatoliy Belsky) - -29 Mar 2012, PHP 5.4.1 RC1 +26 Apr 2012, PHP 5.4.1 - CLI Server: . Fixed bug #61461 (missing checks around malloc() calls). (Ilia) @@ -17,6 +9,7 @@ PHP NEWS . "Connection: close" instead of "Connection: closed" (Gustavo) - Core: + . Fixed crash in ZTS using same class in many threads. (Johannes) . Fixed bug #61374 (html_entity_decode tries to decode code points that don't exist in ISO-8859-1). (Gustavo) . Fixed bug #61273 (call_user_func_array with more than 16333 arguments @@ -48,6 +41,9 @@ PHP NEWS function is by reference). (Nikita Popov) . Improve performance of set_exception_handler while doing reset (Laruence) +- fileinfo: + . Fix fileinfo test problems. (Anatoliy Belsky) + - FPM . Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c). (michaelhood at gmail dot com, Ilia) @@ -3637,7 +3637,7 @@ ac_config_headers="$ac_config_headers main/php_config.h" PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=4 PHP_RELEASE_VERSION=1 -PHP_EXTRA_VERSION="RC2" +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` diff --git a/configure.in b/configure.in index b0cc63bca..e081ae46d 100644 --- a/configure.in +++ b/configure.in @@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=4 PHP_RELEASE_VERSION=1 -PHP_EXTRA_VERSION="RC2" +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` diff --git a/ext/standard/exec.c b/ext/standard/exec.c index b0ccdeca3..a5ca84bb6 100644 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@ -272,8 +272,8 @@ PHPAPI char *php_escape_shell_cmd(char *str) p = NULL; } else { cmd[y++] = '\\'; - cmd[y++] = str[x]; } + cmd[y++] = str[x]; break; #else /* % is Windows specific for enviromental variables, ^%PATH% will diff --git a/main/php_version.h b/main/php_version.h index a4d604824..585c84ed7 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 1 -#define PHP_EXTRA_VERSION "RC2" -#define PHP_VERSION "5.4.1RC2" +#define PHP_EXTRA_VERSION "" +#define PHP_VERSION "5.4.1" #define PHP_VERSION_ID 50401 |