]> granicus.if.org Git - php/log
php
10 years agoMerge branch 'PHP-5.6'
Felipe Pena [Sun, 11 May 2014 12:46:47 +0000 (09:46 -0300)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Felipe Pena [Sun, 11 May 2014 12:46:38 +0000 (09:46 -0300)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Felipe Pena [Sun, 11 May 2014 12:46:25 +0000 (09:46 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)

10 years ago- Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
Felipe Pena [Sun, 11 May 2014 12:45:17 +0000 (09:45 -0300)]
- Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)

10 years agoMerge branch 'PHP-5.6'
Felipe Pena [Sat, 10 May 2014 14:55:51 +0000 (11:55 -0300)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  - Move checking

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Felipe Pena [Sat, 10 May 2014 14:55:48 +0000 (11:55 -0300)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  - Move checking

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Felipe Pena [Sat, 10 May 2014 14:55:45 +0000 (11:55 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Move checking

10 years ago- Move checking
Felipe Pena [Sat, 10 May 2014 14:55:42 +0000 (11:55 -0300)]
- Move checking

10 years agoMerge branch 'PHP-5.6'
Felipe Pena [Sat, 10 May 2014 14:53:59 +0000 (11:53 -0300)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  - Fixed missing NULL check in SimpleXMLElement::xpath()

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Felipe Pena [Sat, 10 May 2014 14:53:54 +0000 (11:53 -0300)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  - Fixed missing NULL check in SimpleXMLElement::xpath()

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Felipe Pena [Sat, 10 May 2014 14:53:45 +0000 (11:53 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed missing NULL check in SimpleXMLElement::xpath()

10 years ago- Fixed missing NULL check in SimpleXMLElement::xpath()
Felipe Pena [Sat, 10 May 2014 14:53:40 +0000 (11:53 -0300)]
- Fixed missing NULL check in SimpleXMLElement::xpath()

10 years agoMerge branch 'PHP-5.6'
Felipe Pena [Sat, 10 May 2014 14:40:04 +0000 (11:40 -0300)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  - Fixed missing NULL check

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Felipe Pena [Sat, 10 May 2014 14:39:47 +0000 (11:39 -0300)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  - Fixed missing NULL check

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Felipe Pena [Sat, 10 May 2014 14:39:28 +0000 (11:39 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed missing NULL check

10 years ago- Fixed missing NULL check
Felipe Pena [Sat, 10 May 2014 14:39:08 +0000 (11:39 -0300)]
- Fixed missing NULL check

10 years agoMerge branch 'PHP-5.6'
Anatol Belski [Fri, 9 May 2014 20:18:07 +0000 (22:18 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream

10 years agoupdated NEWS
Anatol Belski [Fri, 9 May 2014 20:17:22 +0000 (22:17 +0200)]
updated NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Fri, 9 May 2014 20:16:42 +0000 (22:16 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream

10 years agoBug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream
Anatol Belski [Fri, 9 May 2014 20:15:54 +0000 (22:15 +0200)]
Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream

upstream patch applied

10 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Thu, 8 May 2014 09:04:50 +0000 (02:04 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  oops, 5.4 and 5.5 use malloc in TSRM

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Thu, 8 May 2014 09:02:42 +0000 (02:02 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  oops, 5.4 and 5.5 use malloc in TSRM

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Thu, 8 May 2014 09:00:23 +0000 (02:00 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  oops, 5.4 and 5.5 use malloc in TSRM

10 years agooops, 5.4 and 5.5 use malloc in TSRM
Stanislav Malyshev [Thu, 8 May 2014 08:59:39 +0000 (01:59 -0700)]
oops, 5.4 and 5.5 use malloc in TSRM

10 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Thu, 8 May 2014 08:12:06 +0000 (01:12 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  make release tags not fail Travis CI

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Thu, 8 May 2014 08:11:44 +0000 (01:11 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  make release tags not fail Travis CI

10 years agomake release tags not fail Travis CI
Stanislav Malyshev [Thu, 8 May 2014 08:08:55 +0000 (01:08 -0700)]
make release tags not fail Travis CI

10 years agomake release tags not fail Travis CI
Stanislav Malyshev [Thu, 8 May 2014 08:08:55 +0000 (01:08 -0700)]
make release tags not fail Travis CI

10 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Thu, 8 May 2014 08:01:34 +0000 (01:01 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix memory leak in TSRM

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Thu, 8 May 2014 08:01:15 +0000 (01:01 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix memory leak in TSRM

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Thu, 8 May 2014 08:00:51 +0000 (01:00 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix memory leak in TSRM

10 years agoFix memory leak in TSRM
Stanislav Malyshev [Wed, 7 May 2014 20:28:03 +0000 (13:28 -0700)]
Fix memory leak in TSRM

10 years agoFix memory leak in TSRM
Stanislav Malyshev [Wed, 7 May 2014 20:28:03 +0000 (13:28 -0700)]
Fix memory leak in TSRM

10 years agoMerge branch 'PHP-5.6'
Daniel Lowrey [Wed, 7 May 2014 14:13:31 +0000 (08:13 -0600)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Allow crypto_method context value in stream_socket_enable_crypto()

10 years agoBug #67224: stream_socket_enable_crypto()
Daniel Lowrey [Wed, 7 May 2014 13:55:40 +0000 (07:55 -0600)]
Bug #67224: stream_socket_enable_crypto()

- Allow crypto_method context value in stream_socket_enable_crypto()
- As of 5.6.x stream crypto type may be specified in the SSL context,
  making the $crypto_type parameter to stream_socket_enable_crypto()
  optional. This commit checks for a crypto type in the context prior
  to erroring out.
- Update NEWS/UPGRADING

10 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Tue, 6 May 2014 23:03:31 +0000 (01:03 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed test (it requires ext/hash)

Conflicts:
ext/session/tests/031.phpt

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Ferenc Kovacs [Tue, 6 May 2014 23:00:01 +0000 (01:00 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed test (it requires ext/hash)

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Ferenc Kovacs [Tue, 6 May 2014 22:55:05 +0000 (00:55 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed test (it requires ext/hash)

10 years agoFixed test (it requires ext/hash)
Dmitry Stogov [Thu, 10 Apr 2014 08:14:11 +0000 (12:14 +0400)]
Fixed test (it requires ext/hash)

10 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Tue, 6 May 2014 22:39:57 +0000 (00:39 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed tests (they might fail from time to time because of session GC)
  Fix author name on the #63228 patch.

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Ferenc Kovacs [Tue, 6 May 2014 22:38:57 +0000 (00:38 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed tests (they might fail from time to time because of session GC)
  Fix author name on the #63228 patch.

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Ferenc Kovacs [Tue, 6 May 2014 22:38:32 +0000 (00:38 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed tests (they might fail from time to time because of session GC)
  Fix author name on the #63228 patch.

10 years agoFixed tests (they might fail from time to time because of session GC)
Dmitry Stogov [Fri, 11 Apr 2014 08:43:35 +0000 (12:43 +0400)]
Fixed tests (they might fail from time to time because of session GC)

10 years agoFix typo
Martin Jansen [Tue, 6 May 2014 20:08:52 +0000 (22:08 +0200)]
Fix typo

10 years agoThis test requires the hash extension.
Martin Jansen [Tue, 6 May 2014 19:34:10 +0000 (21:34 +0200)]
This test requires the hash extension.

10 years agoMerge branch 'PHP-5.6'
Michael Wallner [Tue, 6 May 2014 10:39:34 +0000 (12:39 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS

10 years agoNEWS
Michael Wallner [Tue, 6 May 2014 10:39:23 +0000 (12:39 +0200)]
NEWS

10 years agoMerge branch 'PHP-5.6'
Michael Wallner [Tue, 6 May 2014 10:36:55 +0000 (12:36 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  XFAIL-- for bug #67198
  remove useless indirection
  fix bug #67198 (php://input regression)

10 years agoXFAIL-- for bug #67198
Michael Wallner [Tue, 6 May 2014 10:19:53 +0000 (12:19 +0200)]
XFAIL-- for bug #67198

10 years agoremove useless indirection
Michael Wallner [Tue, 6 May 2014 10:00:32 +0000 (12:00 +0200)]
remove useless indirection

the stream was initialized within the ops
in a prior version of the slim_post_data patch

10 years agofix bug #67198 (php://input regression)
Michael Wallner [Tue, 6 May 2014 09:59:41 +0000 (11:59 +0200)]
fix bug #67198 (php://input regression)

10 years agoXFAIL-- for bug #67198
Michael Wallner [Tue, 6 May 2014 10:19:53 +0000 (12:19 +0200)]
XFAIL-- for bug #67198

10 years agoremove useless indirection
Michael Wallner [Tue, 6 May 2014 10:00:32 +0000 (12:00 +0200)]
remove useless indirection

the stream was initialized within the ops
in a prior version of the slim_post_data patch

10 years agofix bug #67198 (php://input regression)
Michael Wallner [Tue, 6 May 2014 09:59:41 +0000 (11:59 +0200)]
fix bug #67198 (php://input regression)

10 years agoMerge branch 'PHP-5.6'
Andrey Hristov [Tue, 6 May 2014 09:17:29 +0000 (12:17 +0300)]
Merge branch 'PHP-5.6'

10 years agorename a constant - old name to new name
Andrey Hristov [Tue, 6 May 2014 08:36:03 +0000 (11:36 +0300)]
rename a constant - old name to new name

10 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Mon, 5 May 2014 14:25:38 +0000 (16:25 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  test for bug #67198

10 years agotest for bug #67198
Ferenc Kovacs [Mon, 5 May 2014 14:25:15 +0000 (16:25 +0200)]
test for bug #67198

10 years agoMerge branch 'PHP-5.6'
Anatol Belski [Sun, 4 May 2014 22:51:40 +0000 (00:51 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fixed ZEND_DEBUG usage

10 years agofixed ZEND_DEBUG usage
Anatol Belski [Sun, 4 May 2014 22:50:51 +0000 (00:50 +0200)]
fixed ZEND_DEBUG usage

10 years agoMerge branch 'PHP-5.6'
Anatol Belski [Sun, 4 May 2014 19:34:36 +0000 (21:34 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated libmagic.patch

10 years agoupdated libmagic.patch
Anatol Belski [Sun, 4 May 2014 19:34:17 +0000 (21:34 +0200)]
updated libmagic.patch

10 years agoMerge branch 'PHP-5.6'
Anatol Belski [Sun, 4 May 2014 19:27:37 +0000 (21:27 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  added missing stdint header, bug #66907

10 years agoadded missing stdint header, bug #66907
Anatol Belski [Sun, 4 May 2014 19:26:53 +0000 (21:26 +0200)]
added missing stdint header, bug #66907

10 years agoMerge branch 'PHP-5.6'
Bob Weinand [Sat, 3 May 2014 09:41:33 +0000 (11:41 +0200)]
Merge branch 'PHP-5.6'

10 years agoMerge sapi/phpdbg into PHP-5.6
Bob Weinand [Sat, 3 May 2014 09:40:25 +0000 (11:40 +0200)]
Merge sapi/phpdbg into PHP-5.6

10 years ago/me blushes, really hard
krakjoe [Sat, 3 May 2014 09:37:11 +0000 (10:37 +0100)]
/me blushes, really hard

10 years agoMerge branch 'PHP-5.5'
Ferenc Kovacs [Sat, 3 May 2014 00:51:46 +0000 (02:51 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Ferenc Kovacs [Sat, 3 May 2014 00:51:02 +0000 (02:51 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654

10 years agoonly build and test nts non-debug and ts debug builds as discussed at https://github...
Ferenc Kovacs [Sat, 3 May 2014 00:50:37 +0000 (02:50 +0200)]
only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654

10 years agoMerge branch 'PHP-5.6'
Adam Harvey [Fri, 2 May 2014 21:34:48 +0000 (14:34 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix mysqli build when building against libmysqlclient.

10 years agoFix mysqli build when building against libmysqlclient.
Adam Harvey [Fri, 2 May 2014 21:33:52 +0000 (14:33 -0700)]
Fix mysqli build when building against libmysqlclient.

10 years agoMerge branch 'PHP-5.6'
Adam Harvey [Fri, 2 May 2014 17:26:18 +0000 (10:26 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix author name on the #63228 patch.

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Adam Harvey [Fri, 2 May 2014 17:25:42 +0000 (10:25 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix author name on the #63228 patch.

10 years agoFix author name on the #63228 patch.
Adam Harvey [Fri, 2 May 2014 17:23:09 +0000 (10:23 -0700)]
Fix author name on the #63228 patch.

10 years agoFix author name on the #63228 patch.
Adam Harvey [Fri, 2 May 2014 17:23:09 +0000 (10:23 -0700)]
Fix author name on the #63228 patch.

10 years agoMerge branch 'PHP-5.6'
Nikita Popov [Fri, 2 May 2014 10:52:44 +0000 (12:52 +0200)]
Merge branch 'PHP-5.6'

10 years agoFixed bug #67169: []= after_array_splice incorrect
Nikita Popov [Fri, 2 May 2014 10:48:43 +0000 (12:48 +0200)]
Fixed bug #67169: []= after_array_splice incorrect

This fixes a regression I introduced in beta 1.

10 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Fri, 2 May 2014 07:50:40 +0000 (09:50 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Revert "show leaks in their own group" using valgrind would be a bit too much for travis I guess.

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Ferenc Kovacs [Fri, 2 May 2014 07:50:25 +0000 (09:50 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Revert "show leaks in their own group" using valgrind would be a bit too much for travis I guess.

10 years agoRevert "show leaks in their own group"
Ferenc Kovacs [Fri, 2 May 2014 07:49:10 +0000 (09:49 +0200)]
Revert "show leaks in their own group"
using valgrind would be a bit too much for travis I guess.

This reverts commit ea60d79e23556deb0f72cf4111deefa0d9a55262.

10 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Fri, 2 May 2014 07:33:31 +0000 (09:33 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  show leaks in their own group

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Ferenc Kovacs [Fri, 2 May 2014 07:33:08 +0000 (09:33 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  show leaks in their own group

10 years agoshow leaks in their own group
Ferenc Kovacs [Fri, 2 May 2014 07:32:42 +0000 (09:32 +0200)]
show leaks in their own group

10 years agoMerge branch 'PHP-5.6'
Adam Harvey [Thu, 1 May 2014 18:23:48 +0000 (11:23 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Use the right path for the suggested PHP invocation in ext_skel.
  Changed to more understandable NEWS message
  one heading is enough

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Adam Harvey [Thu, 1 May 2014 18:23:14 +0000 (11:23 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Use the right path for the suggested PHP invocation in ext_skel.

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Adam Harvey [Thu, 1 May 2014 18:22:46 +0000 (11:22 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Use the right path for the suggested PHP invocation in ext_skel.

10 years agoUse the right path for the suggested PHP invocation in ext_skel.
Adam Harvey [Thu, 1 May 2014 18:21:34 +0000 (11:21 -0700)]
Use the right path for the suggested PHP invocation in ext_skel.

Fixes bug #67160 (ext_skel outputs incorrect information).

10 years agoChanged to more understandable NEWS message
Bob Weinand [Thu, 1 May 2014 15:10:00 +0000 (17:10 +0200)]
Changed to more understandable NEWS message

10 years agoone heading is enough
Ferenc Kovacs [Thu, 1 May 2014 14:38:06 +0000 (16:38 +0200)]
one heading is enough

10 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Thu, 1 May 2014 14:25:38 +0000 (16:25 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  add new NEWS block for alpha3

10 years agoadd new NEWS block for alpha3
Ferenc Kovacs [Thu, 1 May 2014 14:24:49 +0000 (16:24 +0200)]
add new NEWS block for alpha3

10 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Thu, 1 May 2014 10:50:28 +0000 (12:50 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  XFAIL the leaking multibyte tests, we should really get to the bottom of this

10 years agoXFAIL the leaking multibyte tests, we should really get to the bottom of this
Ferenc Kovacs [Thu, 1 May 2014 10:49:45 +0000 (12:49 +0200)]
XFAIL the leaking multibyte tests, we should really get to the bottom of this

10 years agoMerge branch 'PHP-5.6'
Bob Weinand [Thu, 1 May 2014 10:30:46 +0000 (12:30 +0200)]
Merge branch 'PHP-5.6'

10 years agoFixed numbering in UPGRADING file
Bob Weinand [Thu, 1 May 2014 10:27:38 +0000 (12:27 +0200)]
Fixed numbering in UPGRADING file

10 years agoMerge branch 'PHP-5.6'
Bob Weinand [Thu, 1 May 2014 09:47:28 +0000 (11:47 +0200)]
Merge branch 'PHP-5.6'

10 years agoUpdated NEWS for fixed phpdbg issue #85
Bob Weinand [Thu, 1 May 2014 09:46:35 +0000 (11:46 +0200)]
Updated NEWS for fixed phpdbg issue #85

10 years agoAdded stdion/stdout/stderr constsnts and their php:// wrappers
Bob Weinand [Thu, 1 May 2014 09:38:08 +0000 (11:38 +0200)]
Added stdion/stdout/stderr constsnts and their php:// wrappers
Fixes issue #85

10 years agoMerge sapi/phpdbg
Bob Weinand [Thu, 1 May 2014 09:41:49 +0000 (11:41 +0200)]
Merge sapi/phpdbg