granicus.if.org Git

Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #67399 (putenv with empty variable may lead to crash)
  Fixed bug #67399 (putenv with empty variable may lead to crash)
  Fixed bug #67399 (putenv with empty variable may lead to crash)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 06:00:38 +0000 (23:00 -0700)]

Fixed bug #67399 (putenv with empty variable may lead to crash)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 06:10:11 +0000 (23:10 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #67399 (putenv with empty variable may lead to crash)
Fixed bug #67399 (putenv with empty variable may lead to crash)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 06:00:38 +0000 (23:00 -0700)]

Fixed bug #67399 (putenv with empty variable may lead to crash)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 06:09:37 +0000 (23:09 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #67399 (putenv with empty variable may lead to crash)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 06:00:38 +0000 (23:00 -0700)]

Fixed bug #67399 (putenv with empty variable may lead to crash)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 06:00:38 +0000 (23:00 -0700)]

Fixed bug #67399 (putenv with empty variable may lead to crash)

commit | commitdiff | tree

Matteo Beccati [Mon, 9 Jun 2014 05:07:28 +0000 (07:07 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191

commit | commitdiff | tree

Matteo Beccati [Mon, 9 Jun 2014 05:07:17 +0000 (07:07 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191

commit | commitdiff | tree

Matteo Beccati [Mon, 9 Jun 2014 05:07:07 +0000 (07:07 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191

commit | commitdiff | tree

Matteo Beccati [Wed, 4 Jun 2014 11:26:24 +0000 (13:26 +0200)]

Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191

DOMDocument::substituteEntities needs to be set to true in order for
external entities to be parsed.

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 02:47:59 +0000 (19:47 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  update news
  add news
  Bug 49898 __getCookies() method implementation

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 02:47:38 +0000 (19:47 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
add news
Bug 49898 __getCookies() method implementation

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 02:47:14 +0000 (19:47 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 02:44:49 +0000 (19:44 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
add news
Bug 49898 __getCookies() method implementation

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 02:38:07 +0000 (19:38 -0700)]

commit | commitdiff | tree

Boro Sitnikovski [Thu, 26 Sep 2013 00:03:48 +0000 (02:03 +0200)]

Bug 49898
__getCookies() method implementation

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 02:29:44 +0000 (19:29 -0700)]

Merge remote-tracking branch 'github/pr/669'

* github/pr/669:
Removed another cvsclean file
Removed cvsclean and svnclean tools

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 02:29:26 +0000 (19:29 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Removed another cvsclean file
Removed cvsclean and svnclean tools

Removed another cvsclean file

Removed cvsclean and svnclean tools

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 02:19:36 +0000 (19:19 -0700)]

Merge remote-tracking branch 'github/pr/462'

* github/pr/462:
Bug 64744 Show the type of the non-object for more descriptive errors

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 02:18:09 +0000 (19:18 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Bug 64744 Show the type of the non-object for more descriptive errors

commit | commitdiff | tree

Boro Sitnikovski [Fri, 20 Sep 2013 00:58:11 +0000 (02:58 +0200)]

Bug 64744
Show the type of the non-object for more descriptive errors

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 02:05:10 +0000 (19:05 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  fix order
  fix order
  add news

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 02:04:47 +0000 (19:04 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix order
fix order

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 02:04:35 +0000 (19:04 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix order

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 02:04:21 +0000 (19:04 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 02:03:50 +0000 (19:03 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 02:03:31 +0000 (19:03 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 02:02:51 +0000 (19:02 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fix bug 666222
Fix bug 666222

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 02:02:24 +0000 (19:02 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix bug 666222
Fix bug 666222

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 01:59:55 +0000 (18:59 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug 666222

commit | commitdiff | tree

Levi Morrison [Tue, 13 May 2014 03:53:08 +0000 (21:53 -0600)]

Fix bug 666222

This also adds some smaller, isolated tests related to bug 66622.

commit | commitdiff | tree

Levi Morrison [Tue, 13 May 2014 03:53:08 +0000 (21:53 -0600)]

Fix bug 666222

This also adds some smaller, isolated tests related to bug 66622.

Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

commit | commitdiff | tree

Stanislav Malyshev [Sun, 8 Jun 2014 22:54:49 +0000 (15:54 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed identation on file
Fix align indentation

commit | commitdiff | tree

Stanislav Malyshev [Sun, 8 Jun 2014 22:54:32 +0000 (15:54 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed identation on file
Fix align indentation

commit | commitdiff | tree

Stanislav Malyshev [Sun, 8 Jun 2014 22:53:26 +0000 (15:53 -0700)]

Merge branch 'PHp-5.4' into PHP-5.5

* PHp-5.4:
Fixed identation on file
Fix align indentation

commit | commitdiff | tree

Bob Weinand [Sun, 8 Jun 2014 22:38:06 +0000 (00:38 +0200)]

Fix segfault in tests with lexer
There's still a bug in parsing commands

commit | commitdiff | tree

Bob Weinand [Sun, 8 Jun 2014 22:02:10 +0000 (00:02 +0200)]

commit | commitdiff | tree

Jefersson Nathan [Tue, 23 Apr 2013 11:24:15 +0000 (08:24 -0300)]

Fixed identation on file

commit | commitdiff | tree

Stanislav Malyshev [Sun, 8 Jun 2014 21:29:03 +0000 (14:29 -0700)]

Merge remote-tracking branch 'github/pr/671'

* github/pr/671:
Fix align indentation
Fixed identation on file

commit | commitdiff | tree

Jefersson Nathan [Mon, 12 May 2014 16:37:47 +0000 (13:37 -0300)]

Fix align indentation

commit | commitdiff | tree

Stanislav Malyshev [Sun, 8 Jun 2014 21:20:30 +0000 (14:20 -0700)]

Merge branch 'pull-request/676'

* pull-request/676:
Added support for parsing ssl certificates using GeneralizedTime format.

commit | commitdiff | tree

Stanislav Malyshev [Sun, 8 Jun 2014 21:20:07 +0000 (14:20 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Added support for parsing ssl certificates using GeneralizedTime format.

commit | commitdiff | tree

Stanislav Malyshev [Sun, 8 Jun 2014 21:19:25 +0000 (14:19 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Added support for parsing ssl certificates using GeneralizedTime format.

commit | commitdiff | tree

Stanislav Malyshev [Sun, 8 Jun 2014 21:18:24 +0000 (14:18 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Added support for parsing ssl certificates using GeneralizedTime format.

commit | commitdiff | tree

Paul Oehler [Tue, 13 May 2014 17:38:25 +0000 (13:38 -0400)]

Added support for parsing ssl certificates using GeneralizedTime format.

fix bug #65698
fix bug #66636

remove phpdbg directory from source tree on travis

commit | commitdiff | tree

Stanislav Malyshev [Sun, 8 Jun 2014 21:01:32 +0000 (14:01 -0700)]

Merge remote-tracking branch 'github/pr/677'

* github/pr/677:
Test
Fix grammar #2683

commit | commitdiff | tree

Stanislav Malyshev [Sun, 8 Jun 2014 20:53:40 +0000 (13:53 -0700)]

Merge branch 'pull-request/687'

* pull-request/687:
Remove superfluous echos.

commit | commitdiff | tree

Stanislav Malyshev [Sun, 8 Jun 2014 20:53:27 +0000 (13:53 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Remove superfluous echos.

commit | commitdiff | tree

Stanislav Malyshev [Sun, 8 Jun 2014 20:53:01 +0000 (13:53 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Remove superfluous echos.

commit | commitdiff | tree

Stanislav Malyshev [Sun, 8 Jun 2014 20:50:41 +0000 (13:50 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Remove superfluous echos.

commit | commitdiff | tree

Jeff Welch [Sun, 8 Jun 2014 08:09:14 +0000 (04:09 -0400)]

Remove superfluous echos.

commit | commitdiff | tree

Bob Weinand [Sun, 8 Jun 2014 20:34:30 +0000 (20:34 +0000)]

Updated parser & leer to be usable with re2c
Fixes some weird temporary compilation errors too

commit | commitdiff | tree

Jeff Welch [Sun, 8 Jun 2014 08:09:14 +0000 (04:09 -0400)]

Remove superfluous echos.

commit | commitdiff | tree

Ferenc Kovacs [Sat, 7 Jun 2014 22:18:33 +0000 (00:18 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
use ./tokenizer_data_gen.sh to for adding T_POW & T_POW_EQUAL

commit | commitdiff | tree

Ferenc Kovacs [Sat, 7 Jun 2014 22:01:01 +0000 (00:01 +0200)]

use ./tokenizer_data_gen.sh to for adding T_POW & T_POW_EQUAL

commit | commitdiff | tree

Ferenc Kovacs [Sat, 7 Jun 2014 13:29:29 +0000 (15:29 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fix bug #67392: token_name() does not return name for T_POW and T_POW_EQUAL token

commit | commitdiff | tree

Ferenc Kovacs [Sat, 7 Jun 2014 13:27:54 +0000 (15:27 +0200)]

Fix bug #67392: token_name() does not return name for T_POW and T_POW_EQUAL token

commit | commitdiff | tree

Remi Collet [Fri, 6 Jun 2014 15:19:57 +0000 (17:19 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
move NEWS entry in the right place

commit | commitdiff | tree

Remi Collet [Fri, 6 Jun 2014 15:19:35 +0000 (17:19 +0200)]

move NEWS entry in the right place

commit | commitdiff | tree

Nikita Popov [Fri, 6 Jun 2014 15:13:08 +0000 (17:13 +0200)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Nikita Popov [Fri, 6 Jun 2014 15:09:49 +0000 (17:09 +0200)]

Fix bug #67392: dtrace breaks argument unpack

commit | commitdiff | tree

Remi Collet [Fri, 6 Jun 2014 12:19:28 +0000 (14:19 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fix bug #67390 insecure temporary file use in the configure script

commit | commitdiff | tree

Remi Collet [Fri, 6 Jun 2014 12:19:21 +0000 (14:19 +0200)]

commit | commitdiff | tree

Remi Collet [Fri, 6 Jun 2014 12:19:05 +0000 (14:19 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Fix bug #67390 insecure temporary file use in the configure script

commit | commitdiff | tree

Remi Collet [Fri, 6 Jun 2014 12:18:29 +0000 (14:18 +0200)]

commit | commitdiff | tree

Remi Collet [Fri, 6 Jun 2014 12:18:17 +0000 (14:18 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
NEWS
Fix bug #67390 insecure temporary file use in the configure script

commit | commitdiff | tree

Remi Collet [Fri, 6 Jun 2014 12:17:54 +0000 (14:17 +0200)]

commit | commitdiff | tree

Remi Collet [Fri, 6 Jun 2014 12:16:04 +0000 (14:16 +0200)]

Fix bug #67390 insecure temporary file use in the configure script

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 15:46:21 +0000 (17:46 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
drop exec perm on doc files

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 15:45:59 +0000 (17:45 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
drop exec perm on doc files

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 15:45:41 +0000 (17:45 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
drop exec perm on doc files

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 15:45:22 +0000 (17:45 +0200)]

drop exec perm on doc files

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 15:36:20 +0000 (17:36 +0200)]

fix test for 5.4/5.5

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 15:34:32 +0000 (17:34 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix test for 5.4/5.5

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 15:34:09 +0000 (17:34 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix test for 5.4/5.5

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 15:33:40 +0000 (17:33 +0200)]

fix test for 5.4/5.5

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 12:04:44 +0000 (14:04 +0200)]

restore correct behavior of DateTime

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 12:01:20 +0000 (14:01 +0200)]

fix test use invalid code

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 12:00:40 +0000 (14:00 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
add test for previous fix

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 12:00:29 +0000 (14:00 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
add test for previous fix

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 12:00:15 +0000 (14:00 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
add test for previous fix

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 12:00:00 +0000 (14:00 +0200)]

add test for previous fix

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 11:47:14 +0000 (13:47 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fix regression introduce in fix for bug #67118

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 11:46:55 +0000 (13:46 +0200)]

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 11:46:41 +0000 (13:46 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Fix regression introduce in fix for bug #67118

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 11:46:13 +0000 (13:46 +0200)]

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 11:45:57 +0000 (13:45 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
NEWS
Fix regression introduce in fix for bug #67118

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 11:45:25 +0000 (13:45 +0200)]

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 11:39:46 +0000 (13:39 +0200)]

Fix regression introduce in fix for bug #67118

The fix was correct but break some code (at least in Horde)
This is a temporary workaround to fix regressioni in 5.4, 5.5 and 5.6

This make php_date_initialize more consistent
- on success return 1 + time initiliazed
- on failure return 0 + time = zero
which is check by DATE_CHECK_INITIALIZED by later method call

Will restore consistency with other date classes in master.