]> granicus.if.org Git - php/log
php
11 years agoMerge branch 'PHP-5.6'
Anatol Belski [Tue, 1 Jul 2014 08:29:14 +0000 (10:29 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated libmagic.patch in 5.6+
  updated libmagic.patch

11 years agoupdated libmagic.patch in 5.6+
Anatol Belski [Tue, 1 Jul 2014 08:28:43 +0000 (10:28 +0200)]
updated libmagic.patch in 5.6+

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Tue, 1 Jul 2014 08:28:20 +0000 (10:28 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated libmagic.patch

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Tue, 1 Jul 2014 08:27:38 +0000 (10:27 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated libmagic.patch

11 years agoupdated libmagic.patch
Anatol Belski [Tue, 1 Jul 2014 08:25:20 +0000 (10:25 +0200)]
updated libmagic.patch

11 years agoMerge branch 'PHP-5.6'
Dmitry Stogov [Mon, 30 Jun 2014 20:17:55 +0000 (00:17 +0400)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed possible crash because of race conditions on modifying constants in shared memory

11 years agoFixed possible crash because of race conditions on modifying constants in shared...
Dmitry Stogov [Mon, 30 Jun 2014 20:13:34 +0000 (00:13 +0400)]
Fixed possible crash because of race conditions on modifying constants in shared memory

11 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Mon, 30 Jun 2014 16:39:31 +0000 (18:39 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  Revert "Fix Bug #67530  error_log=syslog ignored"

11 years agoremove the NEWS entry for the reverted fpm fix
Ferenc Kovacs [Mon, 30 Jun 2014 16:39:06 +0000 (18:39 +0200)]
remove the NEWS entry for the reverted fpm fix

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Ferenc Kovacs [Mon, 30 Jun 2014 16:38:54 +0000 (18:38 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  Revert "Fix Bug #67530  error_log=syslog ignored"

11 years agoremove the NEWS entry for the reverted fpm fix
Ferenc Kovacs [Mon, 30 Jun 2014 16:38:31 +0000 (18:38 +0200)]
remove the NEWS entry for the reverted fpm fix

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Ferenc Kovacs [Mon, 30 Jun 2014 16:38:15 +0000 (18:38 +0200)]
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"

11 years agoremove the NEWS entry for the reverted fpm fix
Ferenc Kovacs [Mon, 30 Jun 2014 16:37:56 +0000 (18:37 +0200)]
remove the NEWS entry for the reverted fpm fix

11 years agoRevert "Fix Bug #67530 error_log=syslog ignored"
Ferenc Kovacs [Mon, 30 Jun 2014 16:37:23 +0000 (18:37 +0200)]
Revert "Fix Bug #67530  error_log=syslog ignored"

This reverts commit a0ecb3794f00e65cd2a073b2073e32d6c2fb7180.

11 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Mon, 30 Jun 2014 10:31:25 +0000 (12:31 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  --enable-fpm for the travis build

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Ferenc Kovacs [Mon, 30 Jun 2014 10:30:49 +0000 (12:30 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  --enable-fpm for the travis build

11 years ago--enable-fpm for the travis build
Ferenc Kovacs [Mon, 30 Jun 2014 10:30:24 +0000 (12:30 +0200)]
--enable-fpm for the travis build

11 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Mon, 30 Jun 2014 00:32:46 +0000 (02:32 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix the last fpm NEWS entry, the other bug is related, but not the same what we fixed here

11 years agofix the last fpm NEWS entry, the other bug is related, but not the same what we fixed...
Ferenc Kovacs [Mon, 30 Jun 2014 00:32:06 +0000 (02:32 +0200)]
fix the last fpm NEWS entry, the other bug is related, but not the same what we fixed here

11 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Sun, 29 Jun 2014 23:35:19 +0000 (01:35 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0

11 years agoNEWS
Ferenc Kovacs [Sun, 29 Jun 2014 23:35:02 +0000 (01:35 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Ferenc Kovacs [Sun, 29 Jun 2014 23:34:47 +0000 (01:34 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0

11 years agoNEWS
Ferenc Kovacs [Sun, 29 Jun 2014 23:34:29 +0000 (01:34 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Ferenc Kovacs [Sun, 29 Jun 2014 23:34:05 +0000 (01:34 +0200)]
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

11 years agoFix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0
Ferenc Kovacs [Sun, 29 Jun 2014 23:30:36 +0000 (01:30 +0200)]
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).

11 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Sun, 29 Jun 2014 23:03:29 +0000 (01:03 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  adding NEWS entry for the fix for bug #65641
  Fix SetHandler proxy:fcgi:// incompatibilities

11 years agoadding NEWS entry for the fix for bug #65641
Ferenc Kovacs [Sun, 29 Jun 2014 23:02:22 +0000 (01:02 +0200)]
adding NEWS entry for the fix for bug #65641

11 years agoMerge branch 'pull-request/694' into PHP-5.6
Ferenc Kovacs [Sun, 29 Jun 2014 22:51:59 +0000 (00:51 +0200)]
Merge branch 'pull-request/694' into PHP-5.6

* pull-request/694:
  Fix SetHandler proxy:fcgi:// incompatibilities

11 years agoMerge branch 'PHP-5.6'
Bob Weinand [Sun, 29 Jun 2014 11:01:11 +0000 (13:01 +0200)]
Merge branch 'PHP-5.6'

11 years agoUpdated NEWS file for recent phpdbg fixes
Bob Weinand [Sun, 29 Jun 2014 10:54:33 +0000 (12:54 +0200)]
Updated NEWS file for recent phpdbg fixes

11 years agoMerge sapi/phpdbg into PHP-5.6
Bob Weinand [Sun, 29 Jun 2014 10:49:10 +0000 (12:49 +0200)]
Merge sapi/phpdbg into PHP-5.6

11 years agoFixed issue krakjoe/phpdbg#94 - List behavior is inconsistent
Bob Weinand [Sun, 29 Jun 2014 10:43:51 +0000 (12:43 +0200)]
Fixed issue krakjoe/phpdbg#94 - List behavior is inconsistent

11 years agoFix issue krakjoe/phpdbg#97 - list now appends a newline if there is none
Bob Weinand [Sun, 29 Jun 2014 10:18:39 +0000 (12:18 +0200)]
Fix issue krakjoe/phpdbg#97 - list now appends a newline if there is none
The prompt should always ensure it is on a newline

11 years agoMerge remote branch 'origin/PHP-5.6'
Xinchen Hui [Sun, 29 Jun 2014 10:06:44 +0000 (18:06 +0800)]
Merge remote branch 'origin/PHP-5.6'

11 years agoFixed test
Xinchen Hui [Sun, 29 Jun 2014 10:00:31 +0000 (18:00 +0800)]
Fixed test

11 years agoInform about back command existence in help - Fixes krakjoe/phpdbg#100
Bob Weinand [Sun, 29 Jun 2014 09:55:42 +0000 (11:55 +0200)]
Inform about back command existence in help - Fixes krakjoe/phpdbg#100
No way to list the current stack/frames

11 years agoFix issue krakjoe/phpdbg#98
Bob Weinand [Sun, 29 Jun 2014 09:40:48 +0000 (11:40 +0200)]
Fix issue krakjoe/phpdbg#98
break if does not seem to work

11 years agoMerge pull request #102 from dshafik/fix-96
Bob Weinand [Sun, 29 Jun 2014 09:28:44 +0000 (11:28 +0200)]
Merge pull request #102 from dshafik/fix-96

Fix typo in `finish` help

11 years agoMerge pull request #101 from dshafik/fix-95
Bob Weinand [Sun, 29 Jun 2014 09:28:33 +0000 (11:28 +0200)]
Merge pull request #101 from dshafik/fix-95

Replace incorrect `E` command with `ev` in watch help

11 years agoFix issue krakjoe/phpdbg#99
Bob Weinand [Sun, 29 Jun 2014 09:26:27 +0000 (11:26 +0200)]
Fix issue krakjoe/phpdbg#99
register function has the same behavior as run

11 years agoFix readline/libedit (Thanks to @remicollet)
Bob Weinand [Sun, 29 Jun 2014 09:26:03 +0000 (11:26 +0200)]
Fix readline/libedit (Thanks to @remicollet)

11 years agoReplace incorrect `E` command with `ev` in watch help
Davey Shafik [Sun, 29 Jun 2014 08:33:27 +0000 (04:33 -0400)]
Replace incorrect `E` command with `ev` in watch help

Fixes #95

11 years agoFix typo in `finish` help
Davey Shafik [Sun, 29 Jun 2014 08:32:01 +0000 (04:32 -0400)]
Fix typo in `finish` help

Fixes #96

11 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Fri, 27 Jun 2014 14:30:30 +0000 (16:30 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  removing the format added by mistake, props to Solar Designer for spotting this.

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Ferenc Kovacs [Fri, 27 Jun 2014 14:29:35 +0000 (16:29 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  removing the format added by mistake, props to Solar Designer for spotting this.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Ferenc Kovacs [Fri, 27 Jun 2014 14:28:24 +0000 (16:28 +0200)]
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.

11 years agoremoving the format added by mistake, props to Solar Designer for spotting this.
Ferenc Kovacs [Fri, 27 Jun 2014 14:27:36 +0000 (16:27 +0200)]
removing the format added by mistake, props to Solar Designer for spotting this.

11 years agoMerge branch 'PHP-5.6'
Remi Collet [Fri, 27 Jun 2014 07:51:52 +0000 (09:51 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fix Bug #67531  syslog cannot be set in pool configuration
  Fix Bug #67530  error_log=syslog ignored

11 years agoNEWS
Remi Collet [Fri, 27 Jun 2014 07:51:34 +0000 (09:51 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Remi Collet [Fri, 27 Jun 2014 07:51:15 +0000 (09:51 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Fix Bug #67531  syslog cannot be set in pool configuration
  Fix Bug #67530  error_log=syslog ignored

11 years agoNEWS
Remi Collet [Fri, 27 Jun 2014 07:50:43 +0000 (09:50 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Remi Collet [Fri, 27 Jun 2014 07:50:27 +0000 (09:50 +0200)]
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

11 years agoNEWS
Remi Collet [Fri, 27 Jun 2014 07:50:01 +0000 (09:50 +0200)]
NEWS

11 years agoFix Bug #67531 syslog cannot be set in pool configuration
Remi Collet [Fri, 27 Jun 2014 07:47:28 +0000 (09:47 +0200)]
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

11 years agoFix Bug #67530 error_log=syslog ignored
Remi Collet [Fri, 27 Jun 2014 07:45:53 +0000 (09:45 +0200)]
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

11 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Fri, 27 Jun 2014 04:18:22 +0000 (21:18 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  update the date
  better explanation
  more extensive note on unserialize() change
  more extensive note on unserialize() change

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Fri, 27 Jun 2014 04:18:06 +0000 (21:18 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update the date
  better explanation

11 years agoMerge branch 'PHp-5.4' into PHP-5.5
Stanislav Malyshev [Fri, 27 Jun 2014 04:16:15 +0000 (21:16 -0700)]
Merge branch 'PHp-5.4' into PHP-5.5

* PHp-5.4:
  update the date
  better explanation

11 years agoupdate the date
Stanislav Malyshev [Fri, 27 Jun 2014 04:15:47 +0000 (21:15 -0700)]
update the date

11 years agobetter explanation
Stanislav Malyshev [Thu, 26 Jun 2014 22:25:19 +0000 (15:25 -0700)]
better explanation

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Thu, 26 Jun 2014 17:40:36 +0000 (10:40 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  more extensive note on unserialize() change
  more extensive note on unserialize() change

11 years agomore extensive note on unserialize() change
Stanislav Malyshev [Thu, 26 Jun 2014 17:39:38 +0000 (10:39 -0700)]
more extensive note on unserialize() change

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Thu, 26 Jun 2014 17:36:38 +0000 (10:36 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  more extensive note on unserialize() change

11 years agomore extensive note on unserialize() change
Stanislav Malyshev [Thu, 26 Jun 2014 17:35:47 +0000 (10:35 -0700)]
more extensive note on unserialize() change

11 years agoMerge branch 'PHP-5.6'
Bob Weinand [Wed, 25 Jun 2014 11:57:19 +0000 (13:57 +0200)]
Merge branch 'PHP-5.6'

11 years agoMerge sapi/phpdbg into PHP-5.6
Bob Weinand [Wed, 25 Jun 2014 11:56:45 +0000 (13:56 +0200)]
Merge sapi/phpdbg into PHP-5.6

11 years agoMerge branch 'master' of https://github.com/oerdnj/phpdbg into master
Bob Weinand [Wed, 25 Jun 2014 11:26:58 +0000 (13:26 +0200)]
Merge branch 'master' of https://github.com/oerdnj/phpdbg into master
Rewritten author line and included instructions to make install the man page

11 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Tue, 24 Jun 2014 18:24:40 +0000 (11:24 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  remove bug67072_2 test for 5.6+ since we'd have cleaner solution
  Fix test - because of big #67397 we don't allow overlong locales anymore

11 years agoremove bug67072_2 test for 5.6+ since we'd have cleaner solution
Stanislav Malyshev [Tue, 24 Jun 2014 18:24:07 +0000 (11:24 -0700)]
remove bug67072_2 test for 5.6+ since we'd have cleaner solution

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Tue, 24 Jun 2014 18:23:48 +0000 (11:23 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix test - because of big #67397 we don't allow overlong locales anymore

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Tue, 24 Jun 2014 18:23:02 +0000 (11:23 -0700)]
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

11 years agoFix test - because of big #67397 we don't allow overlong locales anymore
Stanislav Malyshev [Tue, 24 Jun 2014 18:21:43 +0000 (11:21 -0700)]
Fix test - because of big #67397 we don't allow overlong locales anymore

11 years agoMerge branch 'PHp-5.6'
Stanislav Malyshev [Tue, 24 Jun 2014 17:33:40 +0000 (10:33 -0700)]
Merge branch 'PHp-5.6'

* PHp-5.6:
  Better fix for bug #67072 with more BC provisions
  Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
  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
  update NEWS
  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

11 years agoBetter fix for bug #67072 with more BC provisions
Stanislav Malyshev [Sun, 22 Jun 2014 04:28:33 +0000 (21:28 -0700)]
Better fix for bug #67072 with more BC provisions

11 years agoFix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
Stanislav Malyshev [Mon, 23 Jun 2014 07:19:37 +0000 (00:19 -0700)]
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability

11 years agoFix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
Stanislav Malyshev [Sun, 22 Jun 2014 02:46:16 +0000 (19:46 -0700)]
Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion

11 years agoFix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName ...
Stanislav Malyshev [Sun, 8 Jun 2014 20:44:40 +0000 (13:44 -0700)]
Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))

11 years agoFix bug #67349: Locale::parseLocale Double Free
Stanislav Malyshev [Wed, 4 Jun 2014 08:06:01 +0000 (01:06 -0700)]
Fix bug #67349: Locale::parseLocale Double Free

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Tue, 24 Jun 2014 17:30:56 +0000 (10:30 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
  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

11 years agoBetter fix for bug #67072 with more BC provisions
Stanislav Malyshev [Sun, 22 Jun 2014 04:28:33 +0000 (21:28 -0700)]
Better fix for bug #67072 with more BC provisions

11 years agoFix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
Stanislav Malyshev [Mon, 23 Jun 2014 07:19:37 +0000 (00:19 -0700)]
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability

11 years agoFix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
Stanislav Malyshev [Sun, 22 Jun 2014 02:46:16 +0000 (19:46 -0700)]
Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion

11 years agoFix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName ...
Stanislav Malyshev [Sun, 8 Jun 2014 20:44:40 +0000 (13:44 -0700)]
Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))

11 years agoFix bug #67349: Locale::parseLocale Double Free
Stanislav Malyshev [Wed, 4 Jun 2014 08:06:01 +0000 (01:06 -0700)]
Fix bug #67349: Locale::parseLocale Double Free

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Tue, 24 Jun 2014 17:25:09 +0000 (10:25 -0700)]
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

11 years agoMerge branch 'PHP-5.4.30' into PHP-5.4
Stanislav Malyshev [Tue, 24 Jun 2014 17:23:36 +0000 (10:23 -0700)]
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Tue, 24 Jun 2014 17:20:51 +0000 (10:20 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update NEWS

11 years agoupdate NEWS
Stanislav Malyshev [Tue, 24 Jun 2014 17:20:33 +0000 (10:20 -0700)]
update NEWS

11 years ago5.4.30
Stanislav Malyshev [Tue, 24 Jun 2014 17:17:34 +0000 (10:17 -0700)]
5.4.30

11 years agoMerge branch 'PHP-5.6'
Xinchen Hui [Tue, 24 Jun 2014 05:53:43 +0000 (13:53 +0800)]
Merge branch 'PHP-5.6'

11 years agoFixed bug #67368 (Memory leak with immediately dereferenced array in class constant)
Xinchen Hui [Tue, 24 Jun 2014 05:53:05 +0000 (13:53 +0800)]
Fixed bug #67368 (Memory leak with immediately dereferenced array in class constant)

11 years agoBetter fix for bug #67072 with more BC provisions
Stanislav Malyshev [Sun, 22 Jun 2014 04:28:33 +0000 (21:28 -0700)]
Better fix for bug #67072 with more BC provisions

11 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Tue, 24 Jun 2014 05:15:21 +0000 (22:15 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Better fix for bug #67072 with more BC provisions
  Better fix for bug #67072 with more BC provisions

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Tue, 24 Jun 2014 05:14:33 +0000 (22:14 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Better fix for bug #67072 with more BC provisions
  Better fix for bug #67072 with more BC provisions

Conflicts:
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Tue, 24 Jun 2014 05:13:32 +0000 (22:13 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Better fix for bug #67072 with more BC provisions

11 years agoAdd initial manual page for phpdbg.1
Ondřej Surý [Mon, 23 Jun 2014 09:35:42 +0000 (11:35 +0200)]
Add initial manual page for phpdbg.1

11 years agoMerge branch 'PHP-5.6'
Remi Collet [Mon, 23 Jun 2014 08:39:22 +0000 (10:39 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  Better fix for phpdbg + libedit - fix include - disable coloured prompt only with libedit
  Fix https://github.com/krakjoe/phpdbg/issues/91

11 years agoNEWS
Remi Collet [Mon, 23 Jun 2014 08:39:06 +0000 (10:39 +0200)]
NEWS

11 years agoBetter fix for phpdbg + libedit
Remi Collet [Mon, 23 Jun 2014 08:17:43 +0000 (10:17 +0200)]
Better fix for phpdbg + libedit
- fix include
- disable coloured prompt only with libedit

11 years agoFix https://github.com/krakjoe/phpdbg/issues/91
Remi Collet [Mon, 23 Jun 2014 08:04:40 +0000 (10:04 +0200)]
Fix https://github.com/krakjoe/phpdbg/issues/91

Enable edit feature when build with libedit.

Notice: coloured prompt only enable with READLINE