]> granicus.if.org Git - php/log
projects / php / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
php
10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Sun, 22 Feb 2015 15:27:27 +0000 (16:27 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix Win32 SSPI initialization for digest authentication in cURL

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Sun, 22 Feb 2015 15:26:52 +0000 (16:26 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix Win32 SSPI initialization for digest authentication in cURL

10 years agoMerge branch 'pull-request/1112' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Sun, 22 Feb 2015 15:26:02 +0000 (16:26 +0100)]
Merge branch 'pull-request/1112' into PHP-5.5

10 years agoFix Win32 SSPI initialization for digest authentication in cURL
commit | commitdiff | tree
Grant Pannell [Sun, 22 Feb 2015 13:04:55 +0000 (23:34 +1030)]
Fix Win32 SSPI initialization for digest authentication in cURL

10 years agocorrect title
commit | commitdiff | tree
Xinchen Hui [Sat, 21 Feb 2015 16:22:20 +0000 (00:22 +0800)]
correct title

10 years agoFixed segfault because resource is freed prematurely
commit | commitdiff | tree
Xinchen Hui [Sat, 21 Feb 2015 16:19:06 +0000 (00:19 +0800)]
Fixed segfault because resource is freed prematurely

10 years agoOnly do this in debug build
commit | commitdiff | tree
Xinchen Hui [Sat, 21 Feb 2015 14:44:51 +0000 (22:44 +0800)]
Only do this in debug build

10 years agoFixed mem issue with internal return type hinting assert
commit | commitdiff | tree
Xinchen Hui [Sat, 21 Feb 2015 14:17:17 +0000 (22:17 +0800)]
Fixed mem issue with internal return type hinting assert

10 years agoremoved duplicated code
commit | commitdiff | tree
Anatol Belski [Sat, 21 Feb 2015 13:27:14 +0000 (14:27 +0100)]
removed duplicated code

the exact same function is already used in ext/standard/flock_compat.*

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Sat, 21 Feb 2015 13:16:06 +0000 (14:16 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  revisit fix for bug #65272

Conflicts:
ext/standard/file.c

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Sat, 21 Feb 2015 13:14:24 +0000 (14:14 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  revisit fix for bug #65272

Conflicts:
ext/standard/file.c

10 years agorevisit fix for bug #65272
commit | commitdiff | tree
Anatol Belski [Sat, 21 Feb 2015 13:10:59 +0000 (14:10 +0100)]
revisit fix for bug #65272

10 years agoFixed test fails for bug68557
commit | commitdiff | tree
Xinchen Hui [Sat, 21 Feb 2015 04:36:38 +0000 (12:36 +0800)]
Fixed test fails for bug68557

10 years agoCleanup globals initialization
commit | commitdiff | tree
Xinchen Hui [Sat, 21 Feb 2015 03:35:16 +0000 (11:35 +0800)]
Cleanup globals initialization

No needs explicit inititlize zero for globals in no-zts build.
executor_globals should be initialized in zend side.

10 years agoUnused vars
commit | commitdiff | tree
Xinchen Hui [Sat, 21 Feb 2015 03:02:20 +0000 (11:02 +0800)]
Unused vars

10 years agoUnused var
commit | commitdiff | tree
Xinchen Hui [Sat, 21 Feb 2015 02:58:23 +0000 (10:58 +0800)]
Unused var

10 years agoFixed memory leak
commit | commitdiff | tree
Dmitry Stogov [Fri, 20 Feb 2015 17:50:01 +0000 (20:50 +0300)]
Fixed memory leak

10 years agouint32_t
commit | commitdiff | tree
Xinchen Hui [Fri, 20 Feb 2015 17:19:07 +0000 (01:19 +0800)]
uint32_t

10 years agoClean up tri-state logic to use break instead
commit | commitdiff | tree
Anthony Ferrara [Fri, 20 Feb 2015 16:54:33 +0000 (11:54 -0500)]
Clean up tri-state logic to use break instead

10 years agoFix declare error behavior so that improper usages will actually error
commit | commitdiff | tree
Anthony Ferrara [Fri, 20 Feb 2015 16:43:18 +0000 (11:43 -0500)]
Fix declare error behavior so that improper usages will actually error

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Fri, 20 Feb 2015 15:02:32 +0000 (16:02 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  split test for bug #68557 for windows

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Fri, 20 Feb 2015 15:02:07 +0000 (16:02 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  split test for bug #68557 for windows

10 years agosplit test for bug #68557 for windows
commit | commitdiff | tree
Anatol Belski [Fri, 20 Feb 2015 15:01:34 +0000 (16:01 +0100)]
split test for bug #68557 for windows

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Julien Pauli [Fri, 20 Feb 2015 14:44:30 +0000 (15:44 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Updated NEWS
  Updated NEWS

10 years agoUpdated NEWS
commit | commitdiff | tree
Julien Pauli [Fri, 20 Feb 2015 14:44:18 +0000 (15:44 +0100)]
Updated NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Julien Pauli [Fri, 20 Feb 2015 14:43:53 +0000 (15:43 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Updated NEWS

10 years agoUpdated NEWS
commit | commitdiff | tree
Julien Pauli [Fri, 20 Feb 2015 14:43:38 +0000 (15:43 +0100)]
Updated NEWS

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Julien Pauli [Fri, 20 Feb 2015 14:40:46 +0000 (15:40 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix #68557

Conflicts:
ext/spl/spl_directory.c

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Julien Pauli [Fri, 20 Feb 2015 14:38:48 +0000 (15:38 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix #68557

10 years agoDrop ZE1-compat leftover
commit | commitdiff | tree
Sobak [Fri, 13 Feb 2015 06:17:15 +0000 (07:17 +0100)]
Drop ZE1-compat leftover

10 years agofix #68557
commit | commitdiff | tree
Julien Pauli [Fri, 20 Feb 2015 14:09:35 +0000 (15:09 +0100)]
fix #68557

10 years agoUse fast SSE2 memcpy() for copying block of data from SHM to process memory
commit | commitdiff | tree
Dmitry Stogov [Fri, 20 Feb 2015 13:08:57 +0000 (16:08 +0300)]
Use fast SSE2 memcpy() for copying block of data from SHM to process memory

10 years agoSimplify reallocation during copying data from SHM to process memory
commit | commitdiff | tree
Dmitry Stogov [Fri, 20 Feb 2015 12:38:06 +0000 (15:38 +0300)]
Simplify reallocation during copying data from SHM to process memory

10 years agodon't count op_arrays stored in opcache SHM
commit | commitdiff | tree
Dmitry Stogov [Fri, 20 Feb 2015 11:59:30 +0000 (14:59 +0300)]
don't count op_arrays stored in opcache SHM

10 years agoRemoved dead code
commit | commitdiff | tree
Dmitry Stogov [Fri, 20 Feb 2015 10:46:32 +0000 (13:46 +0300)]
Removed dead code

10 years agoLazy duplication of op_array->static_variables
commit | commitdiff | tree
Dmitry Stogov [Fri, 20 Feb 2015 10:28:26 +0000 (13:28 +0300)]
Lazy duplication of op_array->static_variables

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Dmitry Stogov [Fri, 20 Feb 2015 07:33:07 +0000 (10:33 +0300)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed type mismatch

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Dmitry Stogov [Fri, 20 Feb 2015 07:32:34 +0000 (10:32 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed type mismatch

10 years agoFixed type mismatch
commit | commitdiff | tree
Dmitry Stogov [Fri, 20 Feb 2015 07:31:24 +0000 (10:31 +0300)]
Fixed type mismatch

10 years agoadd NEWS for <=>
commit | commitdiff | tree
Stanislav Malyshev [Thu, 19 Feb 2015 22:02:04 +0000 (23:02 +0100)]
add NEWS for <=>

10 years agothis line got accitentally dropped on merge
commit | commitdiff | tree
Michael Wallner [Thu, 19 Feb 2015 09:50:03 +0000 (10:50 +0100)]
this line got accitentally dropped on merge

10 years agoImplemented AST pretty-printer
commit | commitdiff | tree
Dmitry Stogov [Thu, 19 Feb 2015 08:11:17 +0000 (11:11 +0300)]
Implemented AST pretty-printer

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Ferenc Kovacs [Wed, 18 Feb 2015 19:15:46 +0000 (20:15 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  update NEWS to match the actual stuff in 5.6.6
  update NEWS to match the actual stuff in 5.5.22

10 years agoupdate NEWS to match the actual stuff in 5.6.6
commit | commitdiff | tree
Ferenc Kovacs [Wed, 18 Feb 2015 19:10:28 +0000 (20:10 +0100)]
update NEWS to match the actual stuff in 5.6.6

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Ferenc Kovacs [Wed, 18 Feb 2015 19:09:12 +0000 (20:09 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS to match the actual stuff in 5.5.22

10 years agoupdate NEWS to match the actual stuff in 5.5.22
commit | commitdiff | tree
Ferenc Kovacs [Wed, 18 Feb 2015 19:08:46 +0000 (20:08 +0100)]
update NEWS to match the actual stuff in 5.5.22

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Ferenc Kovacs [Wed, 18 Feb 2015 18:52:32 +0000 (19:52 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  update NEWS(add missing entry for the enchant fix, and reorder the entries a bit)
  fix typo in bug#
  add CVE
  5.4.39 next

10 years agoupdate NEWS(add missing entry for the enchant fix, and reorder the entries a bit)
commit | commitdiff | tree
Ferenc Kovacs [Wed, 18 Feb 2015 18:52:00 +0000 (19:52 +0100)]
update NEWS(add missing entry for the enchant fix, and reorder the entries a bit)

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Ferenc Kovacs [Wed, 18 Feb 2015 18:49:23 +0000 (19:49 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix typo in bug#
  add CVE
  5.4.39 next

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Ferenc Kovacs [Wed, 18 Feb 2015 18:48:50 +0000 (19:48 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix typo in bug#
  add CVE
  5.4.39 next

Conflicts:
configure.in
main/php_version.h

10 years agofix typo in bug#
commit | commitdiff | tree
Ferenc Kovacs [Wed, 18 Feb 2015 18:47:07 +0000 (19:47 +0100)]
fix typo in bug#

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Ferenc Kovacs [Wed, 18 Feb 2015 18:40:21 +0000 (19:40 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  update NEWS

10 years agoupdate NEWS
commit | commitdiff | tree
Ferenc Kovacs [Wed, 18 Feb 2015 18:39:58 +0000 (19:39 +0100)]
update NEWS

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Ferenc Kovacs [Wed, 18 Feb 2015 18:20:36 +0000 (19:20 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix email format

10 years agofix email format
commit | commitdiff | tree
Ferenc Kovacs [Wed, 18 Feb 2015 18:20:13 +0000 (19:20 +0100)]
fix email format

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Ferenc Kovacs [Wed, 18 Feb 2015 15:34:02 +0000 (16:34 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  update NEWS
  update 5.6.6 release date in NEWS
  Fix bug #69033 (Request may get env. variables from previous requests if PHP works as FastCGI)

10 years agoupdate NEWS
commit | commitdiff | tree
Ferenc Kovacs [Wed, 18 Feb 2015 15:33:32 +0000 (16:33 +0100)]
update NEWS

10 years agoupdate 5.6.6 release date in NEWS
commit | commitdiff | tree
Ferenc Kovacs [Wed, 18 Feb 2015 15:32:57 +0000 (16:32 +0100)]
update 5.6.6 release date in NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Ferenc Kovacs [Wed, 18 Feb 2015 15:32:23 +0000 (16:32 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #69033 (Request may get env. variables from previous requests if PHP works as FastCGI)

10 years agoFix bug #69033 (Request may get env. variables from previous requests if PHP works...
commit | commitdiff | tree
Ferenc Kovacs [Wed, 18 Feb 2015 14:27:27 +0000 (15:27 +0100)]
Fix bug #69033 (Request may get env. variables from previous requests if PHP works as FastCGI)

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Michael Wallner [Wed, 18 Feb 2015 13:08:58 +0000 (14:08 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  BFN

10 years agoBFN
commit | commitdiff | tree
Michael Wallner [Wed, 18 Feb 2015 13:08:52 +0000 (14:08 +0100)]
BFN

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Michael Wallner [Wed, 18 Feb 2015 13:06:49 +0000 (14:06 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix test

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Michael Wallner [Wed, 18 Feb 2015 13:06:39 +0000 (14:06 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test

10 years agofix test
commit | commitdiff | tree
Michael Wallner [Wed, 18 Feb 2015 13:06:32 +0000 (14:06 +0100)]
fix test

10 years agofix test
commit | commitdiff | tree
Michael Wallner [Wed, 18 Feb 2015 13:05:45 +0000 (14:05 +0100)]
fix test

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Michael Wallner [Wed, 18 Feb 2015 13:05:10 +0000 (14:05 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix test

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Michael Wallner [Wed, 18 Feb 2015 13:05:02 +0000 (14:05 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test

10 years agofix test
commit | commitdiff | tree
Michael Wallner [Wed, 18 Feb 2015 13:04:53 +0000 (14:04 +0100)]
fix test

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Michael Wallner [Wed, 18 Feb 2015 13:04:19 +0000 (14:04 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #65593 (Segfault when calling ob_start from output buffering callback)

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Michael Wallner [Wed, 18 Feb 2015 12:59:32 +0000 (13:59 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #65593 (Segfault when calling ob_start from output buffering callback)

10 years agoFixed bug #65593 (Segfault when calling ob_start from output buffering callback)
commit | commitdiff | tree
Michael Wallner [Wed, 18 Feb 2015 12:58:31 +0000 (13:58 +0100)]
Fixed bug #65593 (Segfault when calling ob_start from output buffering callback)

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Julien Pauli [Wed, 18 Feb 2015 11:42:02 +0000 (12:42 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Updated NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Julien Pauli [Wed, 18 Feb 2015 11:41:47 +0000 (12:41 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Updated NEWS

10 years agoUpdated NEWS
commit | commitdiff | tree
Julien Pauli [Wed, 18 Feb 2015 11:40:38 +0000 (12:40 +0100)]
Updated NEWS

10 years agoMerge branch 'pull-request/1007'
commit | commitdiff | tree
Stanislav Malyshev [Wed, 18 Feb 2015 07:48:17 +0000 (08:48 +0100)]
Merge branch 'pull-request/1007'

* pull-request/1007:
  Fix associativity to match Perl
  Blast off to space.

10 years agoadd CVE
commit | commitdiff | tree
Remi Collet [Wed, 18 Feb 2015 05:44:41 +0000 (06:44 +0100)]
add CVE

10 years agoSet PHP_JSON_VERSION to 1.4.0
commit | commitdiff | tree
Jakub Zelenka [Tue, 17 Feb 2015 20:52:06 +0000 (20:52 +0000)]
Set PHP_JSON_VERSION to 1.4.0

10 years agoRemove unnecessary resource checks in openssl ext
commit | commitdiff | tree
Jakub Zelenka [Tue, 17 Feb 2015 20:46:36 +0000 (20:46 +0000)]
Remove unnecessary resource checks in openssl ext

The resource val is already checking Z_TYPE_P(val) == IS_RESOURCE.
There is no need to call extended resource fetch functions though.

10 years agoJSON is now maintained
commit | commitdiff | tree
Jakub Zelenka [Tue, 17 Feb 2015 20:44:40 +0000 (20:44 +0000)]
JSON is now maintained

10 years agoimprove debugability in TS debug builds
commit | commitdiff | tree
Anatol Belski [Tue, 17 Feb 2015 18:15:22 +0000 (19:15 +0100)]
improve debugability in TS debug builds

gdb seems to be not always able to fetch the correct context for
thread locals. Thus, the "if (TSRMLS_CACHE)" clause causes gdb to
show crashes which aren't recognized neither with helgrind nor
in release builds. This is reproducable by setting breakpoints on
the exact line where PHP has a tsrm_get_ls_cache() call.

10 years agoMore UPGRADING, in particular on foreach
commit | commitdiff | tree
Nikita Popov [Tue, 17 Feb 2015 15:02:33 +0000 (16:02 +0100)]
More UPGRADING, in particular on foreach

Only doing a shallow description of foreach changes, describing
them completely is too complicated.

10 years agoFixed bug #69038 (switch(SOMECONSTANT) misbehaves) for master
commit | commitdiff | tree
Xinchen Hui [Tue, 17 Feb 2015 14:03:50 +0000 (22:03 +0800)]
Fixed bug #69038 (switch(SOMECONSTANT) misbehaves) for master

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Xinchen Hui [Tue, 17 Feb 2015 13:18:46 +0000 (21:18 +0800)]
Merge branch 'PHP-5.6'

10 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
commit | commitdiff | tree
Xinchen Hui [Tue, 17 Feb 2015 13:17:06 +0000 (21:17 +0800)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

10 years agoMerge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
commit | commitdiff | tree
Xinchen Hui [Tue, 17 Feb 2015 13:16:53 +0000 (21:16 +0800)]
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6

10 years agoReplace var is introduced
commit | commitdiff | tree
Xinchen Hui [Tue, 17 Feb 2015 13:16:37 +0000 (21:16 +0800)]
Replace var is introduced

10 years agoabstain from using xmlCleanupParser
commit | commitdiff | tree
Anatol Belski [Tue, 17 Feb 2015 09:37:52 +0000 (10:37 +0100)]
abstain from using xmlCleanupParser

Depending on circumstances, usage of xmlCleanupParser can affect
the thread local storage, or even cause crashes in single threaded
programs. On shutdown the memory will be freed anyway, however
not using xmlCleanupParser helps to avoid possible shutdown
crashes.

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Tue, 17 Feb 2015 06:47:57 +0000 (07:47 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix TS build

Conflicts:
ext/date/php_date.c

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Tue, 17 Feb 2015 06:47:27 +0000 (07:47 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix TS build

10 years agofix TS build
commit | commitdiff | tree
Stanislav Malyshev [Tue, 17 Feb 2015 06:47:12 +0000 (07:47 +0100)]
fix TS build

10 years ago5.4.39 next
commit | commitdiff | tree
Stanislav Malyshev [Tue, 17 Feb 2015 06:34:00 +0000 (07:34 +0100)]
5.4.39 next

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Tue, 17 Feb 2015 06:10:30 +0000 (07:10 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  update news
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  Port for for bug #68552
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  - BFN

Conflicts:
ext/date/php_date.c

10 years agoFix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
commit | commitdiff | tree
Stanislav Malyshev [Tue, 17 Feb 2015 06:02:20 +0000 (07:02 +0100)]
Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Tue, 17 Feb 2015 05:58:24 +0000 (06:58 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update news

10 years agoupdate news
commit | commitdiff | tree
Stanislav Malyshev [Tue, 17 Feb 2015 05:58:14 +0000 (06:58 +0100)]
update news

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Tue, 17 Feb 2015 05:56:20 +0000 (06:56 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  Port for for bug #68552
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  - BFN

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Tue, 17 Feb 2015 05:53:48 +0000 (06:53 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Port for for bug #68552
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  - BFN

10 years agoFix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
commit | commitdiff | tree
Stanislav Malyshev [Tue, 17 Feb 2015 05:53:27 +0000 (06:53 +0100)]
Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)

10 years agoPort for for bug #68552
commit | commitdiff | tree
Stanislav Malyshev [Mon, 16 Feb 2015 05:50:10 +0000 (06:50 +0100)]
Port for for bug #68552

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