granicus.if.org Git

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
  Fix bug #67251 - date_parse_from_format out-of-bounds read
  Fix bug #67250 (iptcparse out-of-bounds read)

commit | commitdiff | tree

Stanislav Malyshev [Wed, 14 May 2014 00:02:09 +0000 (17:02 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
  Fix bug #67251 - date_parse_from_format out-of-bounds read
  Fix bug #67250 (iptcparse out-of-bounds read)

Conflicts:
ext/date/lib/parse_date.c
ext/date/lib/parse_date.re

commit | commitdiff | tree

Stanislav Malyshev [Tue, 13 May 2014 23:52:17 +0000 (16:52 -0700)]

Merge branch 'bug67251' into PHP-5.4

* bug67251:
Fix bug #67251 - date_parse_from_format out-of-bounds read

Conflicts:
ext/date/lib/parse_date.c

commit | commitdiff | tree

Stanislav Malyshev [Tue, 13 May 2014 23:44:24 +0000 (16:44 -0700)]

Merge branch 'bug67252' into PHP-5.4

* bug67252:
fix bug #67253: timelib_meridian_with_check out-of-bounds read
Fix bug #67252: convert_uudecode out-of-bounds read

commit | commitdiff | tree

Stanislav Malyshev [Tue, 13 May 2014 23:42:23 +0000 (16:42 -0700)]

Merge branch 'bug67250' into PHP-5.4

* bug67250:
Fix bug #67250 (iptcparse out-of-bounds read)

commit | commitdiff | tree

Derick Rethans [Tue, 13 May 2014 15:37:05 +0000 (16:37 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Derick Rethans [Tue, 13 May 2014 15:36:59 +0000 (16:36 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Derick Rethans [Tue, 13 May 2014 15:36:58 +0000 (16:36 +0100)]

- Updated to version 2014.3 (2014c)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 12 May 2014 17:56:03 +0000 (10:56 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix test - output can be chunked

Conflicts:
ext/curl/tests/curl_basic_006.phpt

commit | commitdiff | tree

Stanislav Malyshev [Mon, 12 May 2014 17:54:34 +0000 (10:54 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix test - output can be chunked

commit | commitdiff | tree

Stanislav Malyshev [Mon, 12 May 2014 17:53:45 +0000 (10:53 -0700)]

fix test - output can be chunked

commit | commitdiff | tree

Stanislav Malyshev [Mon, 12 May 2014 07:53:41 +0000 (00:53 -0700)]

commit | commitdiff | tree

Yasuo Ohgaki [Mon, 12 May 2014 06:31:48 +0000 (15:31 +0900)]

Fixed test for commit 997be125eb0228c5b1b6dd278f617791e71192c6

commit | commitdiff | tree

Yasuo Ohgaki [Mon, 12 May 2014 05:58:46 +0000 (14:58 +0900)]

commit | commitdiff | tree

Yasuo Ohgaki [Mon, 12 May 2014 05:56:11 +0000 (14:56 +0900)]

Update UPGRADING according to bug fix

commit | commitdiff | tree

Stanislav Malyshev [Mon, 12 May 2014 05:44:30 +0000 (22:44 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
improve CURL tests to allow testing without separate server

commit | commitdiff | tree

Stanislav Malyshev [Mon, 12 May 2014 05:21:57 +0000 (22:21 -0700)]

improve CURL tests to allow testing without separate server

commit | commitdiff | tree

Yasuo Ohgaki [Mon, 12 May 2014 04:33:53 +0000 (13:33 +0900)]

Fixed bug #67199 mb_regex_encoding mishmash

commit | commitdiff | tree

Stanislav Malyshev [Mon, 12 May 2014 04:09:11 +0000 (21:09 -0700)]

fix bug #67253: timelib_meridian_with_check out-of-bounds read

commit | commitdiff | tree

Stanislav Malyshev [Mon, 12 May 2014 03:29:27 +0000 (20:29 -0700)]

Fix bug #67252: convert_uudecode out-of-bounds read

commit | commitdiff | tree

Stanislav Malyshev [Mon, 12 May 2014 02:34:21 +0000 (19:34 -0700)]

Fix bug #67251 - date_parse_from_format out-of-bounds read

commit | commitdiff | tree

Stanislav Malyshev [Mon, 12 May 2014 02:09:19 +0000 (19:09 -0700)]

Fix bug #67250 (iptcparse out-of-bounds read)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 12 May 2014 01:55:02 +0000 (18:55 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #67248 (imageaffinematrixget missing check of parameters)
  Fix bug #67247 spl_fixedarray_resize integer overflow
  fix news
  add tests stuff to README
  Updated NEWS
  Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions...

commit | commitdiff | tree

Stanislav Malyshev [Mon, 12 May 2014 01:15:29 +0000 (18:15 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #67247 spl_fixedarray_resize integer overflow
fix news

commit | commitdiff | tree

Stanislav Malyshev [Mon, 12 May 2014 01:14:57 +0000 (18:14 -0700)]

Fix bug #67248 (imageaffinematrixget missing check of parameters)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 12 May 2014 00:54:27 +0000 (17:54 -0700)]

Fix bug #67247 spl_fixedarray_resize integer overflow

commit | commitdiff | tree

Stanislav Malyshev [Mon, 12 May 2014 00:43:28 +0000 (17:43 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Fri, 9 May 2014 20:28:39 +0000 (13:28 -0700)]

add tests stuff to README

commit | commitdiff | tree

Bob Weinand [Sun, 11 May 2014 13:15:27 +0000 (15:15 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Bob Weinand [Sun, 11 May 2014 13:13:40 +0000 (15:13 +0200)]

commit | commitdiff | tree

Bob Weinand [Sun, 11 May 2014 13:11:03 +0000 (15:11 +0200)]

Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245)
Linux apparently does not like memcpy in overlapping regions...

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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()

commit | commitdiff | tree

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()

commit | commitdiff | tree

Felipe Pena [Sat, 10 May 2014 14:53:40 +0000 (11:53 -0300)]

- Fixed missing NULL check in SimpleXMLElement::xpath()

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Felipe Pena [Sat, 10 May 2014 14:39:08 +0000 (11:39 -0300)]

- Fixed missing NULL check

commit | commitdiff | tree

Anatol Belski [Fri, 9 May 2014 20:17:22 +0000 (22:17 +0200)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Stanislav Malyshev [Thu, 8 May 2014 08:59:39 +0000 (01:59 -0700)]

oops, 5.4 and 5.5 use malloc in TSRM

commit | commitdiff | tree

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

commit | commitdiff | tree

Stanislav Malyshev [Thu, 8 May 2014 08:08:55 +0000 (01:08 -0700)]

make release tags not fail Travis CI

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Stanislav Malyshev [Wed, 7 May 2014 20:28:03 +0000 (13:28 -0700)]

Fix memory leak in TSRM

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

Dmitry Stogov [Thu, 10 Apr 2014 08:14:11 +0000 (12:14 +0400)]

Fixed test (it requires ext/hash)

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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)

commit | commitdiff | tree

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

commit | commitdiff | tree

Michael Wallner [Tue, 6 May 2014 10:19:53 +0000 (12:19 +0200)]

XFAIL-- for bug #67198

commit | commitdiff | tree

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

commit | commitdiff | tree

Michael Wallner [Tue, 6 May 2014 09:59:41 +0000 (11:59 +0200)]

fix bug #67198 (php://input regression)

commit | commitdiff | tree

Andrey Hristov [Tue, 6 May 2014 08:36:03 +0000 (11:36 +0300)]

rename a constant - old name to new name

commit | commitdiff | tree

Ferenc Kovacs [Mon, 5 May 2014 14:25:15 +0000 (16:25 +0200)]

commit | commitdiff | tree

Anatol Belski [Sun, 4 May 2014 22:50:51 +0000 (00:50 +0200)]

fixed ZEND_DEBUG usage

commit | commitdiff | tree

Anatol Belski [Sun, 4 May 2014 19:34:17 +0000 (21:34 +0200)]

updated libmagic.patch

commit | commitdiff | tree

Anatol Belski [Sun, 4 May 2014 19:26:53 +0000 (21:26 +0200)]

added missing stdint header, bug #66907

commit | commitdiff | tree

Bob Weinand [Sat, 3 May 2014 09:40:25 +0000 (11:40 +0200)]

Merge sapi/phpdbg into PHP-5.6

commit | commitdiff | tree

krakjoe [Sat, 3 May 2014 09:37:11 +0000 (10:37 +0100)]

/me blushes, really hard

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Adam Harvey [Fri, 2 May 2014 21:33:52 +0000 (14:33 -0700)]

Fix mysqli build when building against libmysqlclient.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Adam Harvey [Fri, 2 May 2014 17:23:09 +0000 (10:23 -0700)]

Fix author name on the #63228 patch.

commit | commitdiff | tree

Adam Harvey [Fri, 2 May 2014 17:23:09 +0000 (10:23 -0700)]

Fix author name on the #63228 patch.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Ferenc Kovacs [Fri, 2 May 2014 07:32:42 +0000 (09:32 +0200)]

show leaks in their own group

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.