Ferenc Kovacs
e5fdb5b3f0
remove the NEWS entry for the reverted fpm fix
2014-06-30 18:38:31 +02:00
Ferenc Kovacs
af9ce6e650
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
remove the NEWS entry for the reverted fpm fix
Revert "Fix Bug #67530 error_log=syslog ignored"
2014-06-30 18:38:15 +02:00
Ferenc Kovacs
48df4464ea
remove the NEWS entry for the reverted fpm fix
2014-06-30 18:37:56 +02:00
Ferenc Kovacs
9c8b42960d
Revert "Fix Bug #67530 error_log=syslog ignored"
...
This reverts commit a0ecb3794f
.
2014-06-30 18:37:23 +02:00
Ferenc Kovacs
803cfe32e6
--enable-fpm for the travis build
2014-06-30 12:30:24 +02:00
Ferenc Kovacs
12885ef489
NEWS
2014-06-30 01:34:29 +02:00
Ferenc Kovacs
a52616b759
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67091 : make install fails to install libphp5.so on FreeBSD 10.0
2014-06-30 01:34:05 +02:00
Ferenc Kovacs
a7d1656b96
Fix bug #67091 : make install fails to install libphp5.so on FreeBSD 10.0
...
Simplest fix is to remove the specific checks for freebsd1* as it also matches freebsd10,
and nobody should be using >=PHP 5.4 with freebsd 1.x(if it is even possible to make it
to compile there).
2014-06-30 01:31:10 +02:00
Ferenc Kovacs
293a48cb9d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
removing the format added by mistake, props to Solar Designer for spotting this.
2014-06-27 16:28:24 +02:00
Ferenc Kovacs
cc22f021fe
removing the format added by mistake, props to Solar Designer for spotting this.
2014-06-27 16:27:36 +02:00
Remi Collet
6c72ea87fd
NEWS
2014-06-27 09:50:43 +02:00
Remi Collet
13c5bb9600
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fix Bug #67531 syslog cannot be set in pool configuration
Fix Bug #67530 error_log=syslog ignored
2014-06-27 09:50:27 +02:00
Remi Collet
334758794d
NEWS
2014-06-27 09:50:01 +02:00
Remi Collet
bf328b1681
Fix Bug #67531 syslog cannot be set in pool configuration
...
error_log is listed in FPM_PHP_INI_TO_EXPAND,
but should not be expand when value = syslog
2014-06-27 09:47:28 +02:00
Remi Collet
a0ecb3794f
Fix Bug #67530 error_log=syslog ignored
...
As for Bug #64915
Systemd use --nodaemonize but need to error_log to file or syslog to be honoured
2014-06-27 09:45:53 +02:00
Stanislav Malyshev
b1433d86b2
Merge branch 'PHp-5.4' into PHP-5.5
...
* PHp-5.4:
update the date
better explanation
2014-06-26 21:16:15 -07:00
Stanislav Malyshev
2db96fea2d
update the date
2014-06-26 21:15:47 -07:00
Stanislav Malyshev
b23460063f
better explanation
2014-06-26 15:25:19 -07:00
Stanislav Malyshev
b5003c3a86
more extensive note on unserialize() change
2014-06-26 10:39:38 -07:00
Stanislav Malyshev
d4267ce03a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
more extensive note on unserialize() change
2014-06-26 10:36:38 -07:00
Stanislav Malyshev
ad9ed232e7
more extensive note on unserialize() change
2014-06-26 10:35:47 -07:00
Stanislav Malyshev
2ee09835c1
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix test - because of big #67397 we don't allow overlong locales anymore
2014-06-24 11:23:02 -07:00
Stanislav Malyshev
9d1d25e625
Fix test - because of big #67397 we don't allow overlong locales anymore
2014-06-24 11:21:43 -07:00
Stanislav Malyshev
e2ed4874b5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.30
Better fix for bug #67072 with more BC provisions
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
update CVE
Fix bug #67492 : unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
Fix bug #67349 : Locale::parseLocale Double Free
add CVEs
Fix potential segfault in dns_get_record()
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.30 rc1
Conflicts:
ext/intl/locale/locale_methods.c
2014-06-24 10:25:09 -07:00
Stanislav Malyshev
3488cf6fd8
Merge branch 'PHP-5.4.30' into PHP-5.4
...
* PHP-5.4.30:
5.4.30
Better fix for bug #67072 with more BC provisions
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
update CVE
Fix bug #67492 : unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
Fix bug #67349 : Locale::parseLocale Double Free
add CVEs
Fix potential segfault in dns_get_record()
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.30 rc1
Conflicts:
configure.in
main/php_version.h
2014-06-24 10:23:36 -07:00
Stanislav Malyshev
7ffcb48184
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update NEWS
2014-06-24 10:20:51 -07:00
Stanislav Malyshev
08e7252abf
update NEWS
2014-06-24 10:20:33 -07:00
Stanislav Malyshev
79457d1964
5.4.30
2014-06-24 10:17:49 -07:00
Stanislav Malyshev
6d97b4b2b3
Better fix for bug #67072 with more BC provisions
2014-06-23 22:16:25 -07:00
Stanislav Malyshev
232ab8d795
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Better fix for bug #67072 with more BC provisions
2014-06-23 22:13:32 -07:00
Stanislav Malyshev
fb0128af2a
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
2014-06-23 00:22:59 -07:00
Stanislav Malyshev
f3dd77714d
update CVE
2014-06-23 00:07:08 -07:00
Stanislav Malyshev
342240fd7f
Better fix for bug #67072 with more BC provisions
2014-06-21 21:30:34 -07:00
Stanislav Malyshev
c42d5cf5de
Better fix for bug #67072 with more BC provisions
2014-06-21 21:29:11 -07:00
Stanislav Malyshev
88223c5245
Fix bug #67492 : unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
2014-06-21 19:46:16 -07:00
Stanislav Malyshev
6027c56fd7
Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
2014-06-21 18:44:14 -07:00
Stanislav Malyshev
aef6432fbe
Fix bug #67349 : Locale::parseLocale Double Free
2014-06-21 18:38:41 -07:00
Stanislav Malyshev
300e0418a4
add CVEs
2014-06-21 18:37:08 -07:00
Dmitry Stogov
f0639611cf
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed MarinaDB support
2014-06-20 13:57:38 +04:00
Dmitry Stogov
680ddabac1
Fixed MarinaDB support
2014-06-20 13:56:32 +04:00
Andrey Hristov
21c9a9388f
Suppress test failure with MySQL 5.7
2014-06-18 16:20:14 +03:00
Lior Kaplan
728c554f93
Update copyright year to 2014
2014-06-18 00:12:33 +03:00
Lior Kaplan
a3bd2d268c
Update copyright year to 2014
...
Align with online version at http://www.php.net/license/3_01.txt
2014-06-18 00:11:55 +03:00
Lior Kaplan
d2bdedbcfc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update copyright year to 2014
Update copyright year to 2014
2014-06-18 00:11:35 +03:00
Lior Kaplan
4106d48d1c
Update copyright year to 2014
2014-06-17 23:57:20 +03:00
Lior Kaplan
945938d33c
Update copyright year to 2014
2014-06-17 23:56:46 +03:00
Lior Kaplan
c38b73a701
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update copyright year for re2c generated files
Update copyright year to 2014
Update copyright year for re2c files as well
2014-06-16 23:30:44 +03:00
Lior Kaplan
6f3bcb0d6e
Update copyright year for re2c generated files
2014-06-16 23:28:36 +03:00
Lior Kaplan
2d576c2a99
Update copyright year to 2014
2014-06-16 23:27:45 +03:00
Lior Kaplan
e667d23178
Update copyright year for re2c files as well
2014-06-16 23:26:50 +03:00