granicus.if.org Git

Remi Collet [Mon, 16 Jun 2014 07:44:58 +0000 (09:44 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fix test on modern distro where old unsecure algo are disabled in openssl config. Testing recent algo should be enough to check this function.

commit | commitdiff | tree

Remi Collet [Mon, 16 Jun 2014 07:42:55 +0000 (09:42 +0200)]

Fix test on modern distro where old unsecure algo are disabled in openssl config.
Testing recent algo should be enough to check this function.

commit | commitdiff | tree

Bob Weinand [Sun, 15 Jun 2014 22:43:31 +0000 (00:43 +0200)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Bob Weinand [Sun, 15 Jun 2014 22:42:50 +0000 (00:42 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Bob Weinand [Sun, 15 Jun 2014 22:41:46 +0000 (00:41 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Bob Weinand [Sun, 15 Jun 2014 22:35:20 +0000 (00:35 +0200)]

Merge branch 'pull-request/695' into PHP-5.4

commit | commitdiff | tree

Levi Morrison [Sun, 15 Jun 2014 22:10:40 +0000 (16:10 -0600)]

Added tests for bug 67436

commit | commitdiff | tree

Bob Weinand [Sun, 15 Jun 2014 21:56:14 +0000 (23:56 +0200)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Bob Weinand [Sun, 15 Jun 2014 21:55:44 +0000 (23:55 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Bob Weinand [Sun, 15 Jun 2014 21:54:05 +0000 (23:54 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Bob Weinand [Sun, 15 Jun 2014 21:51:51 +0000 (23:51 +0200)]

Fixed wrong XFAIL test - already fixed

commit | commitdiff | tree

Lior Kaplan [Sun, 15 Jun 2014 21:26:01 +0000 (00:26 +0300)]

Fix typo in Bug #67406 NEWS entry

commit | commitdiff | tree

Lior Kaplan [Sun, 15 Jun 2014 21:26:01 +0000 (00:26 +0300)]

Fix typo in Bug #67406 NEWS entry

commit | commitdiff | tree

Bob Weinand [Sun, 15 Jun 2014 21:16:21 +0000 (23:16 +0200)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Bob Weinand [Sun, 15 Jun 2014 21:06:15 +0000 (23:06 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
NEWS
Zend/zend_compile.c

commit | commitdiff | tree

Bob Weinand [Sun, 15 Jun 2014 20:36:13 +0000 (22:36 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Bob Weinand [Sun, 15 Jun 2014 20:32:47 +0000 (22:32 +0200)]

commit | commitdiff | tree

Bob Weinand [Sun, 15 Jun 2014 20:24:44 +0000 (22:24 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Bob Weinand [Sun, 15 Jun 2014 20:18:25 +0000 (22:18 +0200)]

commit | commitdiff | tree

Bob Weinand [Sun, 15 Jun 2014 13:50:36 +0000 (15:50 +0200)]

commit | commitdiff | tree

Bob Weinand [Sun, 15 Jun 2014 13:47:44 +0000 (15:47 +0200)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Bob Weinand [Sun, 15 Jun 2014 13:47:14 +0000 (15:47 +0200)]

Merge sapi/phpdbg into PHP-5.6

commit | commitdiff | tree

Stanislav Malyshev [Sun, 15 Jun 2014 08:08:16 +0000 (01:08 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  update NEWS
  update NEWS
  update NEWS

commit | commitdiff | tree

Stanislav Malyshev [Sun, 15 Jun 2014 08:07:48 +0000 (01:07 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
update NEWS
update NEWS

commit | commitdiff | tree

Stanislav Malyshev [Sun, 15 Jun 2014 08:07:39 +0000 (01:07 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Sun, 15 Jun 2014 08:06:46 +0000 (01:06 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
update NEWS

commit | commitdiff | tree

Stanislav Malyshev [Sun, 15 Jun 2014 08:06:37 +0000 (01:06 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Sun, 15 Jun 2014 07:46:31 +0000 (00:46 -0700)]

commit | commitdiff | tree

kovacs.ferenc [Sat, 14 Jun 2014 21:48:17 +0000 (23:48 +0200)]

fix bugsnet #67212: phpdbg uses non-standard TIOCGWINSZ

commit | commitdiff | tree

kovacs.ferenc [Thu, 12 Jun 2014 21:13:50 +0000 (23:13 +0200)]

change the default terminal width from 100 to 80, as that is the most common value

commit | commitdiff | tree

Derick Rethans [Fri, 13 Jun 2014 22:26:50 +0000 (23:26 +0100)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Derick Rethans [Fri, 13 Jun 2014 22:26:47 +0000 (23:26 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Derick Rethans [Fri, 13 Jun 2014 22:26:43 +0000 (23:26 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Derick Rethans [Fri, 13 Jun 2014 22:26:42 +0000 (23:26 +0100)]

- Updated to version 2014.5 (2014e)

commit | commitdiff | tree

Matteo Beccati [Fri, 13 Jun 2014 11:14:52 +0000 (13:14 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fix bug #67433 SIGSEGV when using count() on an object implementing Countable

commit | commitdiff | tree

Matteo Beccati [Fri, 13 Jun 2014 11:14:12 +0000 (13:14 +0200)]

Fix bug #67433 SIGSEGV when using count() on an object implementing Countable

commit | commitdiff | tree

krakjoe [Fri, 13 Jun 2014 06:35:11 +0000 (07:35 +0100)]

remove all references

commit | commitdiff | tree

Adam Harvey [Fri, 13 Jun 2014 01:19:11 +0000 (18:19 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Follow 308 Permanent Redirect responses.

commit | commitdiff | tree

Adam Harvey [Fri, 13 Jun 2014 01:17:18 +0000 (18:17 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Follow 308 Permanent Redirect responses.

commit | commitdiff | tree

Adam Harvey [Fri, 13 Jun 2014 01:15:07 +0000 (18:15 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Follow 308 Permanent Redirect responses.

commit | commitdiff | tree

Adam Harvey [Fri, 13 Jun 2014 01:12:53 +0000 (18:12 -0700)]

Follow 308 Permanent Redirect responses.

Fixes bug #67430 (http:// wrapper doesn't follow 308 redirects).

commit | commitdiff | tree

Adam Harvey [Fri, 13 Jun 2014 00:57:55 +0000 (17:57 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Add 308 and 426 to the HTTP response code map in the CLI server.

commit | commitdiff | tree

Adam Harvey [Fri, 13 Jun 2014 00:57:36 +0000 (17:57 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Add 308 and 426 to the HTTP response code map in the CLI server.

commit | commitdiff | tree

Adam Harvey [Fri, 13 Jun 2014 00:56:10 +0000 (17:56 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Add 308 and 426 to the HTTP response code map in the CLI server.

commit | commitdiff | tree

Adam Harvey [Fri, 13 Jun 2014 00:54:29 +0000 (17:54 -0700)]

Add 308 and 426 to the HTTP response code map in the CLI server.

Implements FR #67429 (CLI server is missing some new HTTP response codes).

commit | commitdiff | tree

Adam Harvey [Fri, 13 Jun 2014 00:42:29 +0000 (17:42 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Keep 308-399 HTTP response codes when header('Location:') is called.

commit | commitdiff | tree

Adam Harvey [Fri, 13 Jun 2014 00:40:51 +0000 (17:40 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Keep 308-399 HTTP response codes when header('Location:') is called.

commit | commitdiff | tree

Adam Harvey [Fri, 13 Jun 2014 00:38:52 +0000 (17:38 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Keep 308-399 HTTP response codes when header('Location:') is called.

commit | commitdiff | tree

Adam Harvey [Fri, 13 Jun 2014 00:35:05 +0000 (17:35 -0700)]

Keep 308-399 HTTP response codes when header('Location:') is called.

Fixes bug #67428 (header('Location: foo') will override a 308-399 response
code).

commit | commitdiff | tree

Bob Weinand [Thu, 12 Jun 2014 15:49:02 +0000 (18:49 +0300)]

Make run-tests.php PHP-5.4 compatible

commit | commitdiff | tree

Andrea Faulds [Thu, 12 Jun 2014 09:03:14 +0000 (10:03 +0100)]

Merge branch 'httponly-cookies' of https://github.com/mj/php-src

commit | commitdiff | tree

Adam Harvey [Wed, 11 Jun 2014 21:44:07 +0000 (21:44 +0000)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS entry for Fix potential segfault in dns_get_record()
  NEWS entry for "Fix potential segfault in dns_get_record()"
  NEWS entry for Fix potential segfault in dns_get_record(
  5.5.15 now

commit | commitdiff | tree

Adam Harvey [Wed, 11 Jun 2014 21:43:39 +0000 (21:43 +0000)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS entry for "Fix potential segfault in dns_get_record()"
  NEWS entry for Fix potential segfault in dns_get_record(
  5.5.15 now

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Adam Harvey [Wed, 11 Jun 2014 21:42:26 +0000 (21:42 +0000)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
NEWS entry for "Fix potential segfault in dns_get_record()"

commit | commitdiff | tree

Sara Golemon [Wed, 11 Jun 2014 21:24:50 +0000 (14:24 -0700)]

NEWS entry for Fix potential segfault in dns_get_record()

commit | commitdiff | tree

Sara Golemon [Wed, 11 Jun 2014 21:20:36 +0000 (14:20 -0700)]

NEWS entry for "Fix potential segfault in dns_get_record()"

commit | commitdiff | tree

Sara Golemon [Wed, 11 Jun 2014 21:22:59 +0000 (14:22 -0700)]

NEWS entry for Fix potential segfault in dns_get_record(

commit | commitdiff | tree

Bob Weinand [Wed, 11 Jun 2014 21:18:47 +0000 (00:18 +0300)]

Fixed order in travis script

commit | commitdiff | tree

Bob Weinand [Wed, 11 Jun 2014 21:08:55 +0000 (23:08 +0200)]

Check for all phpdbg compitble php versions

commit | commitdiff | tree

Sara Golemon [Wed, 11 Jun 2014 20:53:59 +0000 (13:53 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fix potential segfault in dns_get_record()

commit | commitdiff | tree

Sara Golemon [Wed, 11 Jun 2014 20:51:53 +0000 (13:51 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix potential segfault in dns_get_record()

commit | commitdiff | tree

Sara Golemon [Wed, 11 Jun 2014 20:37:40 +0000 (13:37 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix potential segfault in dns_get_record()

commit | commitdiff | tree

Sara Golemon [Tue, 10 Jun 2014 18:18:02 +0000 (11:18 -0700)]

Fix potential segfault in dns_get_record()

If the remote sends us a packet with a malformed TXT record,
we could end up trying to over-consume the packet and wander
off into overruns.

commit | commitdiff | tree

Bob Weinand [Wed, 11 Jun 2014 20:35:12 +0000 (23:35 +0300)]

Fix issue #89 — Compile failure in PHP 5.4

zend_hash_get_current_key_zval_ex isn't defined in PHP 5.4. (used in phpdbg_watch.c)

commit | commitdiff | tree

Ferenc Kovacs [Wed, 11 Jun 2014 12:59:39 +0000 (14:59 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Revert "Add optional second arg to unserialize()"

commit | commitdiff | tree

Ferenc Kovacs [Wed, 11 Jun 2014 12:43:09 +0000 (14:43 +0200)]

Revert "Add optional second arg to unserialize()"

This reverts commit cfd104582220d578ab1b78a5991065d038e1f931.

commit | commitdiff | tree

Julien Pauli [Wed, 11 Jun 2014 08:21:26 +0000 (10:21 +0200)]

commit | commitdiff | tree

Stanislav Malyshev [Wed, 11 Jun 2014 06:25:01 +0000 (23:25 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
update NEWS

commit | commitdiff | tree

Stanislav Malyshev [Wed, 11 Jun 2014 06:24:02 +0000 (23:24 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
update NEWS

commit | commitdiff | tree

Stanislav Malyshev [Wed, 11 Jun 2014 06:23:37 +0000 (23:23 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Wed, 11 Jun 2014 06:21:17 +0000 (23:21 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next

commit | commitdiff | tree

Stanislav Malyshev [Wed, 11 Jun 2014 06:20:07 +0000 (23:20 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next

commit | commitdiff | tree

Stanislav Malyshev [Wed, 11 Jun 2014 06:19:21 +0000 (23:19 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Stanislav Malyshev [Wed, 11 Jun 2014 06:17:30 +0000 (23:17 -0700)]

Fix bug #66127 (Segmentation fault with ArrayObject unset)

commit | commitdiff | tree

Stanislav Malyshev [Wed, 11 Jun 2014 06:03:40 +0000 (23:03 -0700)]

commit | commitdiff | tree

Adam Harvey [Wed, 11 Jun 2014 00:31:04 +0000 (00:31 +0000)]

Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.

commit | commitdiff | tree

Adam Harvey [Wed, 11 Jun 2014 00:22:13 +0000 (00:22 +0000)]

commit | commitdiff | tree

Adam Harvey [Wed, 11 Jun 2014 00:19:49 +0000 (00:19 +0000)]

Add a mime type map generation script and update the header.

commit | commitdiff | tree

Adam Harvey [Wed, 11 Jun 2014 00:18:33 +0000 (00:18 +0000)]

Move the mime type map out of php_cli_server.c for easier generation.

commit | commitdiff | tree

Adam Harvey [Tue, 10 Jun 2014 23:56:53 +0000 (23:56 +0000)]

Replace the CLI server's linear search for extensions with a hash table.

This doesn't make a statistically significant performance impact either way
today, but gives us more scope to grow the MIME type list.

commit | commitdiff | tree

Stanislav Malyshev [Tue, 10 Jun 2014 21:25:49 +0000 (14:25 -0700)]

commit | commitdiff | tree

Xinchen Hui [Tue, 10 Jun 2014 13:58:31 +0000 (21:58 +0800)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Xinchen Hui [Tue, 10 Jun 2014 13:58:16 +0000 (21:58 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
Zend/zend_execute_API.c

commit | commitdiff | tree

Xinchen Hui [Tue, 10 Jun 2014 13:56:30 +0000 (21:56 +0800)]

Remove unused included file

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:36:38 +0000 (14:36 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:36:31 +0000 (14:36 +0200)]

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:36:02 +0000 (14:36 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:35:57 +0000 (14:35 +0200)]

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:35:23 +0000 (14:35 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
NEWS
Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:35:14 +0000 (14:35 +0200)]

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:33:37 +0000 (14:33 +0200)]

Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec

Upstream:
https://github.com/file/file/commit/93e063ee374b6a75729df9e7201fb511e47e259d

Adapted for C standard.

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:24:28 +0000 (14:24 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Bug #67412 fileinfo: cdf_count_chain insufficient boundary check

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:24:22 +0000 (14:24 +0200)]

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:24:07 +0000 (14:24 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Bug #67412 fileinfo: cdf_count_chain insufficient boundary check

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:24:00 +0000 (14:24 +0200)]

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:23:37 +0000 (14:23 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
NEWS
Bug #67412 fileinfo: cdf_count_chain insufficient boundary check

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:23:31 +0000 (14:23 +0200)]

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:22:04 +0000 (14:22 +0200)]

Bug #67412 fileinfo: cdf_count_chain insufficient boundary check

Upstream:
https://github.com/file/file/commit/40bade80cbe2af1d0b2cd0420cebd5d5905a2382

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:17:06 +0000 (14:17 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fixed Bug #67411 fileinfo: cdf_check_stream_offset insufficient boundary check

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:16:58 +0000 (14:16 +0200)]

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom