]> granicus.if.org Git - php/log
projects / php / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
php
10 years agoMerge remote-tracking branch 'github/pr/671'
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

10 years agoMerge branch 'pull-request/676'
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.

10 years agoMerge branch 'PHP-5.6'
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.

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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.

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
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.

10 years agoAdded 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

10 years agoMerge remote-tracking branch 'github/pr/677'
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

10 years agoMerge branch 'pull-request/687'
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.

10 years agoMerge branch 'PHP-5.6'
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.

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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.

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
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.

10 years agoRemove superfluous echos.
commit | commitdiff | tree
Jeff Welch [Sun, 8 Jun 2014 08:09:14 +0000 (04:09 -0400)]
Remove superfluous echos.

10 years agoRemove superfluous echos.
commit | commitdiff | tree
Jeff Welch [Sun, 8 Jun 2014 08:09:14 +0000 (04:09 -0400)]
Remove superfluous echos.

10 years agoMerge branch 'PHP-5.6'
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

10 years agouse ./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

10 years agoMerge branch 'PHP-5.6'
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

10 years agoFix 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

10 years agoMerge branch 'PHP-5.6'
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

10 years agomove 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

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Nikita Popov [Fri, 6 Jun 2014 15:13:08 +0000 (17:13 +0200)]
Merge branch 'PHP-5.6'

10 years agoFix bug #67392: dtrace breaks argument unpack
commit | commitdiff | tree
Nikita Popov [Fri, 6 Jun 2014 15:09:49 +0000 (17:09 +0200)]
Fix bug #67392: dtrace breaks argument unpack

10 years agoMerge branch 'PHP-5.6'
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

10 years agoNEWS
commit | commitdiff | tree
Remi Collet [Fri, 6 Jun 2014 12:19:21 +0000 (14:19 +0200)]
NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

10 years agoNEWS
commit | commitdiff | tree
Remi Collet [Fri, 6 Jun 2014 12:18:29 +0000 (14:18 +0200)]
NEWS

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

10 years agoNEWS
commit | commitdiff | tree
Remi Collet [Fri, 6 Jun 2014 12:17:54 +0000 (14:17 +0200)]
NEWS

10 years agoFix bug #67390 insecure temporary file use in the configure script
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

10 years agoMerge branch 'PHP-5.6'
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

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

10 years agodrop 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

10 years agofix test for 5.4/5.5
commit | commitdiff | tree
Remi Collet [Thu, 5 Jun 2014 15:36:20 +0000 (17:36 +0200)]
fix test for 5.4/5.5

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

10 years agoMerge branch 'PHP-5.4' into PHP-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

10 years agofix 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

10 years agorestore correct behavior of DateTime
commit | commitdiff | tree
Remi Collet [Thu, 5 Jun 2014 12:04:44 +0000 (14:04 +0200)]
restore correct behavior of DateTime

10 years agofix test use invalid code
commit | commitdiff | tree
Remi Collet [Thu, 5 Jun 2014 12:01:20 +0000 (14:01 +0200)]
fix test use invalid code

10 years agoMerge branch 'PHP-5.6'
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

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

10 years agoadd 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

10 years agoMerge branch 'PHP-5.6'
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

10 years agoNEWS
commit | commitdiff | tree
Remi Collet [Thu, 5 Jun 2014 11:46:55 +0000 (13:46 +0200)]
NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

10 years agoNEWS
commit | commitdiff | tree
Remi Collet [Thu, 5 Jun 2014 11:46:13 +0000 (13:46 +0200)]
NEWS

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

10 years agoNEWS
commit | commitdiff | tree
Remi Collet [Thu, 5 Jun 2014 11:45:25 +0000 (13:45 +0200)]
NEWS

10 years agoFix regression introduce in fix for bug #67118
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.

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Wed, 4 Jun 2014 08:11:40 +0000 (01:11 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  update news
  update NEWS
  fix gcov data with some locales (again)

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Wed, 4 Jun 2014 08:11:07 +0000 (01:11 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update news
  update NEWS
  fix gcov data with some locales (again)

10 years agoupdate news
commit | commitdiff | tree
Stanislav Malyshev [Wed, 4 Jun 2014 08:10:45 +0000 (01:10 -0700)]
update news

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Wed, 4 Jun 2014 08:10:12 +0000 (01:10 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update NEWS

10 years agoupdate NEWS
commit | commitdiff | tree
Stanislav Malyshev [Wed, 4 Jun 2014 08:09:37 +0000 (01:09 -0700)]
update NEWS

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Bob Weinand [Wed, 4 Jun 2014 00:20:35 +0000 (02:20 +0200)]
Merge branch 'PHP-5.6'

Conflicts:
sapi/phpdbg/phpdbg.c

10 years agoMerge sapi/phpdbg into PHP-5.6
commit | commitdiff | tree
Bob Weinand [Wed, 4 Jun 2014 00:18:39 +0000 (02:18 +0200)]
Merge sapi/phpdbg into PHP-5.6

10 years agoFix tests
commit | commitdiff | tree
Bob Weinand [Wed, 4 Jun 2014 00:15:50 +0000 (02:15 +0200)]
Fix tests

10 years agoFix possible segfault depending on memory location...
commit | commitdiff | tree
Bob Weinand [Wed, 4 Jun 2014 00:15:34 +0000 (02:15 +0200)]
Fix possible segfault depending on memory location...

10 years agoFixed startup segfault in non-debug builds
commit | commitdiff | tree
Bob Weinand [Tue, 3 Jun 2014 21:00:45 +0000 (21:00 +0000)]
Fixed startup segfault in non-debug builds
Fixes issue #87

10 years agoPHP 5.4/5.5 compability in phpdbg_watch.c
commit | commitdiff | tree
Bob Weinand [Sun, 18 May 2014 09:38:55 +0000 (11:38 +0200)]
PHP 5.4/5.5 compability in phpdbg_watch.c

10 years agofix gcov data with some locales (again)
commit | commitdiff | tree
Nuno Lopes [Tue, 3 Jun 2014 21:22:16 +0000 (17:22 -0400)]
fix gcov data with some locales (again)

10 years agofix gcov data with some locales (again)
commit | commitdiff | tree
Nuno Lopes [Tue, 3 Jun 2014 21:21:45 +0000 (17:21 -0400)]
fix gcov data with some locales (again)

10 years agofix gcov data with some locales (again)
commit | commitdiff | tree
Nuno Lopes [Tue, 3 Jun 2014 21:21:20 +0000 (17:21 -0400)]
fix gcov data with some locales (again)

10 years agoUpdate NEWS
commit | commitdiff | tree
Bob Weinand [Tue, 3 Jun 2014 21:18:24 +0000 (21:18 +0000)]
Update NEWS

10 years agoMerge sapi/phpdbg into PHP-5.6
commit | commitdiff | tree
Bob Weinand [Tue, 3 Jun 2014 21:15:02 +0000 (21:15 +0000)]
Merge sapi/phpdbg into PHP-5.6

10 years agoFixed startup segfault in non-debug builds
commit | commitdiff | tree
Bob Weinand [Tue, 3 Jun 2014 21:00:45 +0000 (21:00 +0000)]
Fixed startup segfault in non-debug builds
Fixes issue #87

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Tue, 3 Jun 2014 18:52:30 +0000 (20:52 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed regression introduced by patch for bug #67072

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Tue, 3 Jun 2014 18:51:51 +0000 (20:51 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed regression introduced by patch for bug #67072

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Tue, 3 Jun 2014 18:51:18 +0000 (20:51 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed regression introduced by patch for bug #67072

10 years agoFixed regression introduced by patch for bug #67072
commit | commitdiff | tree
Anatol Belski [Tue, 3 Jun 2014 18:43:58 +0000 (20:43 +0200)]
Fixed regression introduced by patch for bug #67072

This applies to 5.4 and 5.5 only as a legacy fix.

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Tue, 3 Jun 2014 09:38:19 +0000 (11:38 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files

10 years agoFixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF...
commit | commitdiff | tree
Anatol Belski [Tue, 3 Jun 2014 09:37:20 +0000 (11:37 +0200)]
Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Remi Collet [Tue, 3 Jun 2014 09:28:54 +0000 (11:28 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  (re)add cve number in NEWS, from 5.4.29

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Remi Collet [Tue, 3 Jun 2014 09:28:43 +0000 (11:28 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  (re)add cve number in NEWS, from 5.4.29

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Remi Collet [Tue, 3 Jun 2014 09:28:21 +0000 (11:28 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  (re)add cve number in NEWS, from 5.4.29

10 years ago(re)add cve number in NEWS, from 5.4.29
commit | commitdiff | tree
Remi Collet [Tue, 3 Jun 2014 09:28:07 +0000 (11:28 +0200)]
(re)add cve number in NEWS, from 5.4.29

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Remi Collet [Tue, 3 Jun 2014 09:10:08 +0000 (11:10 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check

10 years agoNEWS
commit | commitdiff | tree
Remi Collet [Tue, 3 Jun 2014 09:09:52 +0000 (11:09 +0200)]
NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Remi Collet [Tue, 3 Jun 2014 09:09:29 +0000 (11:09 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check

10 years agoNEWS
commit | commitdiff | tree
Remi Collet [Tue, 3 Jun 2014 09:09:18 +0000 (11:09 +0200)]
NEWS

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Remi Collet [Tue, 3 Jun 2014 09:09:04 +0000 (11:09 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS
  Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check

10 years agoNEWS
commit | commitdiff | tree
Remi Collet [Tue, 3 Jun 2014 09:08:46 +0000 (11:08 +0200)]
NEWS

10 years agoFix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check
commit | commitdiff | tree
Remi Collet [Tue, 3 Jun 2014 09:05:00 +0000 (11:05 +0200)]
Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check

Upstream fix https://github.com/file/file/commit/6d209c1c489457397a5763bca4b28e43aac90391.patch
Only revelant part applied

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Ferenc Kovacs [Tue, 3 Jun 2014 08:28:23 +0000 (10:28 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  add NEWS block for 5.6.0RC1

10 years agoadd NEWS block for 5.6.0RC1
commit | commitdiff | tree
Ferenc Kovacs [Tue, 3 Jun 2014 08:27:42 +0000 (10:27 +0200)]
add NEWS block for 5.6.0RC1

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Xinchen Hui [Sun, 1 Jun 2014 11:42:53 +0000 (19:42 +0800)]
Merge branch 'PHP-5.6'

10 years agoUpdate NEWs
commit | commitdiff | tree
Xinchen Hui [Sun, 1 Jun 2014 11:42:39 +0000 (19:42 +0800)]
Update NEWs

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Xinchen Hui [Sun, 1 Jun 2014 11:42:20 +0000 (19:42 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoUpdate NEWs
commit | commitdiff | tree
Xinchen Hui [Sun, 1 Jun 2014 11:42:01 +0000 (19:42 +0800)]
Update NEWs

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Xinchen Hui [Sun, 1 Jun 2014 11:41:35 +0000 (19:41 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

10 years agoFixed bug #67359 (Segfault in recursiveDirectoryIterator)
commit | commitdiff | tree
Xinchen Hui [Sun, 1 Jun 2014 11:41:01 +0000 (19:41 +0800)]
Fixed bug #67359 (Segfault in recursiveDirectoryIterator)

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Adam Harvey [Thu, 29 May 2014 17:57:54 +0000 (17:57 +0000)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Check for zero-length keys in spl_array_skip_protected and don't skip them.
  added CVEs in NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Adam Harvey [Thu, 29 May 2014 17:56:32 +0000 (17:56 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Check for zero-length keys in spl_array_skip_protected and don't skip them.
  added CVEs in NEWS

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Adam Harvey [Thu, 29 May 2014 17:53:28 +0000 (17:53 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Check for zero-length keys in spl_array_skip_protected and don't skip them.

10 years agoCheck for zero-length keys in spl_array_skip_protected and don't skip them.
commit | commitdiff | tree
Adam Harvey [Thu, 29 May 2014 17:49:32 +0000 (17:49 +0000)]
Check for zero-length keys in spl_array_skip_protected and don't skip them.

Fixes bug #67360 (Missing element after ArrayObject::getIterator).

10 years agoadded CVEs in NEWS
commit | commitdiff | tree
Julien Pauli [Wed, 28 May 2014 08:59:57 +0000 (10:59 +0200)]
added CVEs in NEWS

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Tue, 27 May 2014 20:40:17 +0000 (22:40 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated libmagic.patch for 5.6+
  updated libmagic.patch for 5.4+

10 years agoupdated libmagic.patch for 5.6+
commit | commitdiff | tree
Anatol Belski [Tue, 27 May 2014 20:39:54 +0000 (22:39 +0200)]
updated libmagic.patch for 5.6+

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Tue, 27 May 2014 20:38:30 +0000 (22:38 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated libmagic.patch for 5.4+

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Tue, 27 May 2014 20:38:02 +0000 (22:38 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated libmagic.patch for 5.4+

Conflicts:
ext/fileinfo/libmagic.patch

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