]> granicus.if.org Git - php/log
projects / php / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
php
9 years agoFix leak in RecursiveRegexIterator::getChildren()
commit | commitdiff | tree
Nikita Popov [Wed, 15 Apr 2015 18:01:16 +0000 (20:01 +0200)]
Fix leak in RecursiveRegexIterator::getChildren()

9 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Ferenc Kovacs [Wed, 15 Apr 2015 18:01:13 +0000 (20:01 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  66550 will be part of 5.6.8
  66550 will be part of 5.5.24

9 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Dmitry Stogov [Wed, 15 Apr 2015 17:55:38 +0000 (20:55 +0300)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Fix leaks in recursive iterator construction

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Ferenc Kovacs [Wed, 15 Apr 2015 17:54:30 +0000 (19:54 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  66550 will be part of 5.5.24

9 years ago66550 will be part of 5.6.8
commit | commitdiff | tree
Ferenc Kovacs [Wed, 15 Apr 2015 17:54:25 +0000 (19:54 +0200)]
66550 will be part of 5.6.8

9 years ago66550 will be part of 5.5.24
commit | commitdiff | tree
Ferenc Kovacs [Wed, 15 Apr 2015 17:53:38 +0000 (19:53 +0200)]
66550 will be part of 5.5.24

9 years agoeliminate unnecessary EX(opline) <-> opline reloading
commit | commitdiff | tree
Dmitry Stogov [Wed, 15 Apr 2015 17:53:27 +0000 (20:53 +0300)]
eliminate unnecessary EX(opline) <-> opline reloading

9 years agoFix leaks in recursive iterator construction
commit | commitdiff | tree
Nikita Popov [Wed, 15 Apr 2015 17:49:50 +0000 (19:49 +0200)]
Fix leaks in recursive iterator construction

9 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Ferenc Kovacs [Wed, 15 Apr 2015 16:53:39 +0000 (18:53 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  reorder entries, Core is always the first block

9 years agoreorder entries, Core is always the first block
commit | commitdiff | tree
Ferenc Kovacs [Wed, 15 Apr 2015 16:53:22 +0000 (18:53 +0200)]
reorder entries, Core is always the first block

9 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Ferenc Kovacs [Wed, 15 Apr 2015 16:39:30 +0000 (18:39 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  add missing NEWS entry
  add missing space to the NEWS entries to align properly

9 years agoadd missing NEWS entry
commit | commitdiff | tree
Ferenc Kovacs [Wed, 15 Apr 2015 16:39:16 +0000 (18:39 +0200)]
add missing NEWS entry

9 years agoadd missing space to the NEWS entries to align properly
commit | commitdiff | tree
Ferenc Kovacs [Wed, 15 Apr 2015 16:38:48 +0000 (18:38 +0200)]
add missing space to the NEWS entries to align properly

9 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Ferenc Kovacs [Wed, 15 Apr 2015 16:37:20 +0000 (18:37 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  add missing space to the NEWS entries to align properly

9 years agoadd missing space to the NEWS entries to align properly
commit | commitdiff | tree
Ferenc Kovacs [Wed, 15 Apr 2015 16:36:52 +0000 (18:36 +0200)]
add missing space to the NEWS entries to align properly

9 years agofix possible int overflow
commit | commitdiff | tree
Anatol Belski [Wed, 15 Apr 2015 14:11:35 +0000 (16:11 +0200)]
fix possible int overflow

9 years agofix datatype mismatches
commit | commitdiff | tree
Anatol Belski [Wed, 15 Apr 2015 14:06:46 +0000 (16:06 +0200)]
fix datatype mismatches

9 years agooptimize structs
commit | commitdiff | tree
Anatol Belski [Wed, 15 Apr 2015 14:02:15 +0000 (16:02 +0200)]
optimize structs

9 years agofix data type and 64-bit compat
commit | commitdiff | tree
Anatol Belski [Wed, 15 Apr 2015 11:44:12 +0000 (13:44 +0200)]
fix data type and 64-bit compat

9 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Remi Collet [Wed, 15 Apr 2015 15:38:01 +0000 (17:38 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  bump zip release to match pecl version

9 years agobump zip release to match pecl version
commit | commitdiff | tree
Remi Collet [Wed, 15 Apr 2015 15:37:12 +0000 (17:37 +0200)]
bump zip release to match pecl version

9 years agoOptimization of stack-frame construction
commit | commitdiff | tree
Dmitry Stogov [Wed, 15 Apr 2015 14:02:21 +0000 (17:02 +0300)]
Optimization of stack-frame construction

9 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Julien Pauli [Wed, 15 Apr 2015 12:41:41 +0000 (14:41 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Updated NEWS

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Julien Pauli [Wed, 15 Apr 2015 12:40:33 +0000 (14:40 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Updated NEWS

9 years agoUpdated NEWS
commit | commitdiff | tree
Julien Pauli [Wed, 15 Apr 2015 12:40:00 +0000 (14:40 +0200)]
Updated NEWS

9 years agoMake valgrind happy
commit | commitdiff | tree
Dmitry Stogov [Wed, 15 Apr 2015 11:20:59 +0000 (14:20 +0300)]
Make valgrind happy

9 years agoAvoid double refcounting
commit | commitdiff | tree
Dmitry Stogov [Wed, 15 Apr 2015 10:34:23 +0000 (13:34 +0300)]
Avoid double refcounting

9 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Wed, 15 Apr 2015 09:10:29 +0000 (11:10 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix dir separator in test

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Wed, 15 Apr 2015 09:09:54 +0000 (11:09 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix dir separator in test

9 years agofix dir separator in test
commit | commitdiff | tree
Anatol Belski [Wed, 15 Apr 2015 09:07:13 +0000 (11:07 +0200)]
fix dir separator in test

9 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Xinchen Hui [Wed, 15 Apr 2015 02:44:51 +0000 (10:44 +0800)]
Merge branch 'PHP-5.6'

Conflicts:
Zend/zend_exceptions.c

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Xinchen Hui [Wed, 15 Apr 2015 02:39:17 +0000 (10:39 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

9 years agoFixed res leak
commit | commitdiff | tree
Xinchen Hui [Wed, 15 Apr 2015 02:38:55 +0000 (10:38 +0800)]
Fixed res leak

9 years agoFixed warnings
commit | commitdiff | tree
Xinchen Hui [Wed, 15 Apr 2015 02:37:35 +0000 (10:37 +0800)]
Fixed warnings

9 years agoFix leak when calling ->get() on tmp property
commit | commitdiff | tree
Nikita Popov [Tue, 14 Apr 2015 20:15:38 +0000 (22:15 +0200)]
Fix leak when calling ->get() on tmp property

9 years agoFix leak in timezone_open when instantiation fails
commit | commitdiff | tree
Nikita Popov [Tue, 14 Apr 2015 19:43:43 +0000 (21:43 +0200)]
Fix leak in timezone_open when instantiation fails

9 years agoRegenerate tokenizer data
commit | commitdiff | tree
Nikita Popov [Tue, 14 Apr 2015 19:36:17 +0000 (21:36 +0200)]
Regenerate tokenizer data

9 years agoDrop ??? for AST_ZNODE in ast pretty printer
commit | commitdiff | tree
Nikita Popov [Tue, 14 Apr 2015 19:35:38 +0000 (21:35 +0200)]
Drop ??? for AST_ZNODE in ast pretty printer

9 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 18:13:17 +0000 (11:13 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed recently introduced memory leak
  Fix Bug #69402: Reading empty SSL stream hangs until timeout

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 18:12:58 +0000 (11:12 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed recently introduced memory leak
  Fix Bug #69402: Reading empty SSL stream hangs until timeout

9 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 18:12:48 +0000 (11:12 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed recently introduced memory leak

9 years agoFixed recently introduced memory leak
commit | commitdiff | tree
Dmitry Stogov [Tue, 14 Apr 2015 12:47:26 +0000 (15:47 +0300)]
Fixed recently introduced memory leak

9 years agoAdd "yield from" support to ast pretty printer
commit | commitdiff | tree
Nikita Popov [Tue, 14 Apr 2015 17:15:40 +0000 (19:15 +0200)]
Add "yield from" support to ast pretty printer

9 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Dmitry Stogov [Tue, 14 Apr 2015 16:54:30 +0000 (19:54 +0300)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Add NEWS/UPGRADING and some implementation notes

9 years agoFixed bug #69446 (GC leak relating to removal of nested data after dtors run)
commit | commitdiff | tree
Dmitry Stogov [Tue, 14 Apr 2015 16:53:56 +0000 (19:53 +0300)]
Fixed bug #69446 (GC leak relating to removal of nested data after dtors run)

9 years agoAdd NEWS/UPGRADING and some implementation notes
commit | commitdiff | tree
Bob Weinand [Tue, 14 Apr 2015 16:35:47 +0000 (18:35 +0200)]
Add NEWS/UPGRADING and some implementation notes

9 years agoMerge branch 'master' of https://github.com/php/php-src
commit | commitdiff | tree
Bob Weinand [Tue, 14 Apr 2015 16:02:18 +0000 (18:02 +0200)]
Merge branch 'master' of https://github.com/php/php-src

9 years agoMerge branch 'coroutineDelegation' of https://github.com/bwoebi/php-src
commit | commitdiff | tree
Bob Weinand [Tue, 14 Apr 2015 15:58:58 +0000 (17:58 +0200)]
Merge branch 'coroutineDelegation' of https://github.com/bwoebi/php-src

9 years agoFix bug #69448
commit | commitdiff | tree
Levi Morrison [Tue, 14 Apr 2015 15:45:41 +0000 (09:45 -0600)]
Fix bug #69448

ReflectionClass::newInstanceWithoutConstructor should not call
object_init_ex when the class is internal and final. This is because
the class dtor may rely on the ctor being called and in some cases
this will cause a segfault.

9 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Daniel Lowrey [Tue, 14 Apr 2015 15:42:01 +0000 (09:42 -0600)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Update NEWS

9 years agoUpdate NEWS
commit | commitdiff | tree
Daniel Lowrey [Tue, 14 Apr 2015 15:37:17 +0000 (09:37 -0600)]
Update NEWS

9 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Daniel Lowrey [Tue, 14 Apr 2015 15:27:37 +0000 (09:27 -0600)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix Bug #69402: Reading empty SSL stream hangs until timeout

Conflicts:
ext/openssl/xp_ssl.c

9 years agoFix Bug #69402: Reading empty SSL stream hangs until timeout
commit | commitdiff | tree
Daniel Lowrey [Tue, 14 Apr 2015 15:12:28 +0000 (09:12 -0600)]
Fix Bug #69402: Reading empty SSL stream hangs until timeout

9 years agoFix Bug #69402: Reading empty SSL stream hangs until timeout
commit | commitdiff | tree
Daniel Lowrey [Tue, 14 Apr 2015 15:12:28 +0000 (09:12 -0600)]
Fix Bug #69402: Reading empty SSL stream hangs until timeout

9 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Nikita Popov [Tue, 14 Apr 2015 14:38:09 +0000 (16:38 +0200)]
Merge branch 'PHP-5.6'

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

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Nikita Popov [Tue, 14 Apr 2015 14:36:09 +0000 (16:36 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

9 years agoFixed bug #69419
commit | commitdiff | tree
Nikita Popov [Tue, 14 Apr 2015 14:35:23 +0000 (16:35 +0200)]
Fixed bug #69419

9 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Dmitry Stogov [Tue, 14 Apr 2015 14:18:55 +0000 (17:18 +0300)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Bug #63336 is not a bug
  fix test

Conflicts:
Zend/tests/bug63336.phpt

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Dmitry Stogov [Tue, 14 Apr 2015 14:16:57 +0000 (17:16 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Bug #63336 is not a bug

9 years agoBug #63336 is not a bug
commit | commitdiff | tree
Dmitry Stogov [Tue, 14 Apr 2015 14:15:50 +0000 (17:15 +0300)]
Bug #63336 is not a bug

9 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Dmitry Stogov [Tue, 14 Apr 2015 13:42:35 +0000 (16:42 +0300)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  fix test

9 years agoFixed use after free
commit | commitdiff | tree
Dmitry Stogov [Tue, 14 Apr 2015 13:42:02 +0000 (16:42 +0300)]
Fixed use after free

9 years agofix test
commit | commitdiff | tree
Anatol Belski [Tue, 14 Apr 2015 13:20:44 +0000 (15:20 +0200)]
fix test

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Tue, 14 Apr 2015 13:21:47 +0000 (15:21 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test

9 years agofix test
commit | commitdiff | tree
Anatol Belski [Tue, 14 Apr 2015 13:20:44 +0000 (15:20 +0200)]
fix test

9 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Dmitry Stogov [Tue, 14 Apr 2015 12:49:44 +0000 (15:49 +0300)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed recently introduced memory leak

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Dmitry Stogov [Tue, 14 Apr 2015 12:48:20 +0000 (15:48 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed recently introduced memory leak

9 years agoFixed recently introduced memory leak
commit | commitdiff | tree
Dmitry Stogov [Tue, 14 Apr 2015 12:47:26 +0000 (15:47 +0300)]
Fixed recently introduced memory leak

9 years agoPartial revert of 1a7798c786466977ef8d2bc95b40a435c47c845a that introduced wrong...
commit | commitdiff | tree
Dmitry Stogov [Tue, 14 Apr 2015 12:35:33 +0000 (15:35 +0300)]
Partial revert of 1a7798c786466977ef8d2bc95b40a435c47c845a that introduced wrong memory access

9 years agoMerge branch 'master' of https://git.php.net/repository/php-src
commit | commitdiff | tree
Xinchen Hui [Tue, 14 Apr 2015 11:50:03 +0000 (19:50 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src

9 years agoFixed test in PHP7
commit | commitdiff | tree
Xinchen Hui [Tue, 14 Apr 2015 11:49:00 +0000 (19:49 +0800)]
Fixed test in PHP7

9 years agoFixed recently introduced memory leak
commit | commitdiff | tree
Dmitry Stogov [Tue, 14 Apr 2015 11:46:26 +0000 (14:46 +0300)]
Fixed recently introduced memory leak

9 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Xinchen Hui [Tue, 14 Apr 2015 11:33:46 +0000 (19:33 +0800)]
Merge branch 'PHP-5.6'

Conflicts:
Zend/zend_exceptions.c

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Xinchen Hui [Tue, 14 Apr 2015 11:32:28 +0000 (19:32 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

9 years agocodes standard
commit | commitdiff | tree
Xinchen Hui [Tue, 14 Apr 2015 11:32:01 +0000 (19:32 +0800)]
codes standard

9 years agoFixed memory leak in ext/standard/tests/array/compact_variation1.phpt
commit | commitdiff | tree
Dmitry Stogov [Tue, 14 Apr 2015 10:45:05 +0000 (13:45 +0300)]
Fixed memory leak in ext/standard/tests/array/compact_variation1.phpt

9 years agoUse Z_TYPE_INFO_P() instead Z_TYPE_P() when we check for few scalar types. This allow...
commit | commitdiff | tree
Dmitry Stogov [Tue, 14 Apr 2015 10:09:31 +0000 (13:09 +0300)]
Use Z_TYPE_INFO_P() instead Z_TYPE_P() when we check for few scalar types. This allow C compiler to generate the better code.

9 years ago- Updated to version 2015.3 (2015c)
commit | commitdiff | tree
Derick Rethans [Tue, 14 Apr 2015 09:51:15 +0000 (10:51 +0100)]
- Updated to version 2015.3 (2015c)

9 years agoEmpty merge
commit | commitdiff | tree
Derick Rethans [Tue, 14 Apr 2015 09:51:15 +0000 (10:51 +0100)]
Empty merge

9 years ago- Updated to version 2015.3 (2015c)
commit | commitdiff | tree
Derick Rethans [Tue, 14 Apr 2015 09:51:12 +0000 (10:51 +0100)]
- Updated to version 2015.3 (2015c)

9 years agoEmpty merge
commit | commitdiff | tree
Derick Rethans [Tue, 14 Apr 2015 09:51:11 +0000 (10:51 +0100)]
Empty merge

9 years ago- Updated to version 2015.3 (2015c)
commit | commitdiff | tree
Derick Rethans [Tue, 14 Apr 2015 09:51:10 +0000 (10:51 +0100)]
- Updated to version 2015.3 (2015c)

9 years agoMerge remote-tracking branch 'origin/master'
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 08:30:59 +0000 (01:30 -0700)]
Merge remote-tracking branch 'origin/master'

* origin/master:
  What should we version the bundled opcache?

9 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 08:20:31 +0000 (01:20 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6: (27 commits)
  fix non-standard C
  update NEWS
  5.4.41 next
  fix CVE num
  update NEWS
  Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
  fix test
  fix type in fix for #69085
  fix memory leak & add test
  Fix tests
  fix CVE num
  Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
  Fix test
  Additional fix for bug #69324
  More fixes for bug #69152
  Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
  Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
  Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
  Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
  Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
  ...

Conflicts:
Zend/zend_exceptions.c
ext/curl/interface.c
ext/dom/document.c
ext/fileinfo/libmagic/softmagic.c
ext/gd/gd.c
ext/hash/hash.c
ext/pgsql/pgsql.c
ext/phar/phar.c
ext/phar/phar_internal.h
ext/standard/http_fopen_wrapper.c
ext/standard/link.c
ext/standard/streamsfuncs.c
ext/xmlwriter/php_xmlwriter.c
ext/zlib/zlib.c

9 years agoWhat should we version the bundled opcache?
commit | commitdiff | tree
Xinchen Hui [Tue, 14 Apr 2015 08:20:01 +0000 (16:20 +0800)]
What should we version the bundled opcache?

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 07:51:14 +0000 (00:51 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5: (27 commits)
  fix non-standard C
  update NEWS
  5.4.41 next
  fix CVE num
  update NEWS
  Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
  fix test
  fix type in fix for #69085
  fix memory leak & add test
  Fix tests
  fix CVE num
  Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
  Fix test
  Additional fix for bug #69324
  More fixes for bug #69152
  Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
  Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
  Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
  Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
  Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
  ...

Conflicts:
ext/standard/http_fopen_wrapper.c

9 years agoMerge branch 'PHp-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 07:49:23 +0000 (00:49 -0700)]
Merge branch 'PHp-5.4' into PHP-5.5

* PHp-5.4:
  fix non-standard C

9 years agofix non-standard C
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 07:46:47 +0000 (00:46 -0700)]
fix non-standard C

9 years agoupdate NEWS
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 07:43:19 +0000 (00:43 -0700)]
update NEWS

9 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 07:34:02 +0000 (00:34 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.41 next
  fix CVE num
  update NEWS
  Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
  fix type in fix for #69085
  fix CVE num

Conflicts:
configure.in
main/php_version.h

9 years agoMerge branch 'PHP-5.5.24' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 07:33:04 +0000 (00:33 -0700)]
Merge branch 'PHP-5.5.24' into PHP-5.5

* PHP-5.5.24:
  fix test
  fix memory leak & add test
  Fix tests
  Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
  Fix test
  Additional fix for bug #69324
  More fixes for bug #69152
  Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
  Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
  Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
  Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
  Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
  Fixed bug #68901 (use after free)
  Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
  Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
  Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
  Updated NEWS
  Fixed bug #69336 (Issues with "last day of <monthname>").
  5.5.24RC1

9 years ago5.4.41 next
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 07:30:58 +0000 (00:30 -0700)]
5.4.41 next

9 years agoMerge branch 'PHP-5.4.40' into PHP-5.4
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 07:26:15 +0000 (00:26 -0700)]
Merge branch 'PHP-5.4.40' into PHP-5.4

* PHP-5.4.40:
  update NEWS
  Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
  fix memory leak & add test
  Fix tests
  fix CVE num
  Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
  Fix test
  Additional fix for bug #69324
  More fixes for bug #69152
  Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
  Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
  Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
  Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
  Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)

9 years agofix CVE num
commit | commitdiff | tree
Stanislav Malyshev [Mon, 13 Apr 2015 03:47:27 +0000 (20:47 -0700)]
fix CVE num

9 years agoupdate NEWS
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 07:22:09 +0000 (00:22 -0700)]
update NEWS

9 years agoMerge branch 'PHP-5.4' into PHP-5.4.40
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 07:08:57 +0000 (00:08 -0700)]
Merge branch 'PHP-5.4' into PHP-5.4.40

* PHP-5.4:
  fix CVE num

9 years agoFix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 07:03:50 +0000 (00:03 -0700)]
Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)

9 years agofix test
commit | commitdiff | tree
Stanislav Malyshev [Mon, 13 Apr 2015 23:10:05 +0000 (16:10 -0700)]
fix test

9 years agoFixed memory leak
commit | commitdiff | tree
Dmitry Stogov [Mon, 13 Apr 2015 21:57:45 +0000 (00:57 +0300)]
Fixed memory leak

9 years agoGC improved to support inner-cycles.
commit | commitdiff | tree
Dmitry Stogov [Mon, 13 Apr 2015 21:16:27 +0000 (00:16 +0300)]
GC improved to support inner-cycles.

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