granicus.if.org Git

Merge branch 'PHP-5.6'

* PHP-5.6:
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014

commit | commitdiff | tree

Lior Kaplan [Tue, 17 Jun 2014 21:18:47 +0000 (00:18 +0300)]

Update copyright year to 2014

commit | commitdiff | tree

Lior Kaplan [Tue, 17 Jun 2014 21:16:23 +0000 (00:16 +0300)]

Update copyright year to 2014

Align with online version at http://www.php.net/license/3_01.txt

commit | commitdiff | tree

Lior Kaplan [Tue, 17 Jun 2014 21:14:18 +0000 (00:14 +0300)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014

commit | commitdiff | tree

Lior Kaplan [Tue, 17 Jun 2014 21:12:33 +0000 (00:12 +0300)]

Update copyright year to 2014

commit | commitdiff | tree

Lior Kaplan [Tue, 17 Jun 2014 21:11:55 +0000 (00:11 +0300)]

Update copyright year to 2014

Align with online version at http://www.php.net/license/3_01.txt

commit | commitdiff | tree

Lior Kaplan [Tue, 17 Jun 2014 21:11:35 +0000 (00:11 +0300)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Update copyright year to 2014
Update copyright year to 2014

commit | commitdiff | tree

Lior Kaplan [Tue, 17 Jun 2014 20:57:20 +0000 (23:57 +0300)]

Update copyright year to 2014

commit | commitdiff | tree

Lior Kaplan [Tue, 17 Jun 2014 20:56:46 +0000 (23:56 +0300)]

Update copyright year to 2014

commit | commitdiff | tree

Remi Collet [Tue, 17 Jun 2014 07:41:30 +0000 (09:41 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
NEWS
Fix Request #67453 Allow to unserialize empty data.

commit | commitdiff | tree

Remi Collet [Tue, 17 Jun 2014 07:41:10 +0000 (09:41 +0200)]

commit | commitdiff | tree

Remi Collet [Tue, 17 Jun 2014 07:38:54 +0000 (09:38 +0200)]

Fix Request #67453 Allow to unserialize empty data.

SplDoublyLinkedList, SplObjectStorage and ArrayObject have empty
constructor (no arg), so it make sense to allow to unserialize empty
data.

This allow the hack (used in various place, including PHPUnit) to
instanciate class without call to constructor to work.

commit | commitdiff | tree

Lior Kaplan [Mon, 16 Jun 2014 20:36:39 +0000 (23:36 +0300)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  Update copyright year to 2014
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well

commit | commitdiff | tree

Lior Kaplan [Mon, 16 Jun 2014 20:34:50 +0000 (23:34 +0300)]

Update copyright year to 2014

commit | commitdiff | tree

Lior Kaplan [Mon, 16 Jun 2014 20:32:10 +0000 (23:32 +0300)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well

commit | commitdiff | tree

Lior Kaplan [Mon, 16 Jun 2014 20:30:44 +0000 (23:30 +0300)]

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

commit | commitdiff | tree

Lior Kaplan [Mon, 16 Jun 2014 20:28:36 +0000 (23:28 +0300)]

Update copyright year for re2c generated files

commit | commitdiff | tree

Lior Kaplan [Mon, 16 Jun 2014 20:27:45 +0000 (23:27 +0300)]

Update copyright year to 2014

commit | commitdiff | tree

Lior Kaplan [Mon, 16 Jun 2014 20:26:50 +0000 (23:26 +0300)]

Update copyright year for re2c files as well

commit | commitdiff | tree

Bob Weinand [Mon, 16 Jun 2014 09:20:05 +0000 (11:20 +0200)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Bob Weinand [Mon, 16 Jun 2014 09:18:45 +0000 (11:18 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
Zend/zend_compile.c

commit | commitdiff | tree

Bob Weinand [Mon, 16 Jun 2014 09:16:33 +0000 (11:16 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Bob Weinand [Mon, 16 Jun 2014 09:10:50 +0000 (11:10 +0200)]

Fix patch for bug #67436

commit | commitdiff | tree

Remi Collet [Mon, 16 Jun 2014 08:52:39 +0000 (10:52 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fix failed test

commit | commitdiff | tree

Remi Collet [Mon, 16 Jun 2014 08:52:26 +0000 (10:52 +0200)]

commit | commitdiff | tree

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

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

RSS Atom