]> granicus.if.org Git - php/log
php
10 years agouse correct api
Anatol Belski [Fri, 20 Mar 2015 08:36:38 +0000 (09:36 +0100)]
use correct api

10 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Fri, 20 Mar 2015 13:41:22 +0000 (14:41 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  this already had an entry

10 years agothis already had an entry
Ferenc Kovacs [Fri, 20 Mar 2015 13:40:58 +0000 (14:40 +0100)]
this already had an entry

10 years agoreverting pear/install-pear-nozlib.phar as this mass php 5 -> php 7 string replace...
Ferenc Kovacs [Fri, 20 Mar 2015 12:35:07 +0000 (13:35 +0100)]
reverting pear/install-pear-nozlib.phar as this mass php 5 -> php 7 string replace broke the file signature(phar files are binary)

10 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Fri, 20 Mar 2015 12:34:55 +0000 (13:34 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  add pear to the travis build

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Ferenc Kovacs [Fri, 20 Mar 2015 12:34:35 +0000 (13:34 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  add pear to the travis build

10 years agoadd pear to the travis build
Ferenc Kovacs [Fri, 20 Mar 2015 12:34:16 +0000 (13:34 +0100)]
add pear to the travis build

10 years agoMerge branch 'PHP-5.6'
Julien Pauli [Fri, 20 Mar 2015 09:53:44 +0000 (10:53 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Updated NEWS

10 years agoUpdated NEWS
Julien Pauli [Fri, 20 Mar 2015 09:53:33 +0000 (10:53 +0100)]
Updated NEWS

10 years agoMerge branch 'PHP-5.6'
Julien Pauli [Fri, 20 Mar 2015 09:53:13 +0000 (10:53 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Updated NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Julien Pauli [Fri, 20 Mar 2015 09:45:54 +0000 (10:45 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Updated NEWS

10 years agoUpdated NEWS
Julien Pauli [Fri, 20 Mar 2015 09:45:36 +0000 (10:45 +0100)]
Updated NEWS

10 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Fri, 20 Mar 2015 06:06:19 +0000 (23:06 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  add CVEs

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Fri, 20 Mar 2015 06:05:49 +0000 (23:05 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  add CVEs

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Fri, 20 Mar 2015 06:05:34 +0000 (23:05 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add CVEs

10 years agoadd CVEs
Stanislav Malyshev [Fri, 20 Mar 2015 05:53:29 +0000 (22:53 -0700)]
add CVEs

10 years agoFixed optimization patterns
Dmitry Stogov [Fri, 20 Mar 2015 02:24:04 +0000 (05:24 +0300)]
Fixed optimization patterns

10 years agoOptimize zend_string_realloc() add more specialized versions zend_string_extend(...
Dmitry Stogov [Thu, 19 Mar 2015 23:02:42 +0000 (02:02 +0300)]
Optimize zend_string_realloc() add more specialized versions zend_string_extend() and zend_string_truncate()

10 years agofix condition
Anatol Belski [Thu, 19 Mar 2015 12:43:24 +0000 (13:43 +0100)]
fix condition

10 years agofix condition
Anatol Belski [Thu, 19 Mar 2015 12:40:49 +0000 (13:40 +0100)]
fix condition

10 years agofix include
Anatol Belski [Thu, 19 Mar 2015 12:22:10 +0000 (13:22 +0100)]
fix include

10 years agousing zend_stat_t
Anatol Belski [Thu, 19 Mar 2015 12:21:48 +0000 (13:21 +0100)]
using zend_stat_t

10 years agofix datatype mismatch warnings
Anatol Belski [Thu, 19 Mar 2015 06:45:10 +0000 (07:45 +0100)]
fix datatype mismatch warnings

10 years agoString reference counters may be increased when string copied
Dmitry Stogov [Thu, 19 Mar 2015 20:42:39 +0000 (23:42 +0300)]
String reference counters may be increased when string copied

10 years agoMerge branch 'PHP-5.6'
Lior Kaplan [Thu, 19 Mar 2015 16:25:57 +0000 (18:25 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Add CVE ID for #68735
  Add CVE ID for #68735

10 years agoAdd CVE ID for #68735
Lior Kaplan [Thu, 19 Mar 2015 16:25:01 +0000 (18:25 +0200)]
Add CVE ID for #68735

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Lior Kaplan [Thu, 19 Mar 2015 16:24:28 +0000 (18:24 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Add CVE ID for #68735

10 years agoAdd CVE ID for #68735
Lior Kaplan [Thu, 19 Mar 2015 16:23:34 +0000 (18:23 +0200)]
Add CVE ID for #68735

10 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Thu, 19 Mar 2015 09:03:44 +0000 (17:03 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src

10 years agoMerge branch 'PHP-5.6'
Dmitry Stogov [Thu, 19 Mar 2015 08:54:56 +0000 (11:54 +0300)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #69152

Conflicts:
ext/soap/soap.c

10 years agoFixed global register checking
Xinchen Hui [Thu, 19 Mar 2015 08:54:13 +0000 (16:54 +0800)]
Fixed global register checking

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Dmitry Stogov [Thu, 19 Mar 2015 08:48:10 +0000 (11:48 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #69152

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Thu, 19 Mar 2015 08:42:49 +0000 (11:42 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #69152

10 years agoFixed bug #69152
Dmitry Stogov [Thu, 19 Mar 2015 08:36:01 +0000 (11:36 +0300)]
Fixed bug #69152

10 years agoMerge branch 'PHP-5.6'
Lior Kaplan [Thu, 19 Mar 2015 00:47:22 +0000 (02:47 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Add CVE to bug #69253
  Align entries format
  Add CVE assigned to 5.6.6 bugs after the release
  Add CVE to bug #69248
  Align entries format
  Add CVE to bug #69248
  Add CVE assigned to 5.5.22 bugs after the release

10 years agoAdd CVE to bug #69253
Lior Kaplan [Thu, 19 Mar 2015 00:44:45 +0000 (02:44 +0200)]
Add CVE to bug #69253

10 years agoAlign entries format
Lior Kaplan [Thu, 19 Mar 2015 00:42:35 +0000 (02:42 +0200)]
Align entries format

10 years agoAdd CVE assigned to 5.6.6 bugs after the release
Lior Kaplan [Thu, 19 Mar 2015 00:40:22 +0000 (02:40 +0200)]
Add CVE assigned to 5.6.6 bugs after the release

10 years agoAdd CVE to bug #69248
Lior Kaplan [Thu, 19 Mar 2015 00:37:50 +0000 (02:37 +0200)]
Add CVE to bug #69248

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Lior Kaplan [Thu, 19 Mar 2015 00:36:28 +0000 (02:36 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Align entries format
  Add CVE to bug #69248
  Add CVE assigned to 5.5.22 bugs after the release

10 years agoAlign entries format
Lior Kaplan [Thu, 19 Mar 2015 00:35:20 +0000 (02:35 +0200)]
Align entries format

10 years agoAdd CVE to bug #69248
Lior Kaplan [Thu, 19 Mar 2015 00:30:31 +0000 (02:30 +0200)]
Add CVE to bug #69248

10 years agoAdd CVE assigned to 5.5.22 bugs after the release
Lior Kaplan [Thu, 19 Mar 2015 00:29:43 +0000 (02:29 +0200)]
Add CVE assigned to 5.5.22 bugs after the release

10 years agoRemove bogus ZEND_ASSERT(hash != 0)
Bob Weinand [Wed, 18 Mar 2015 21:25:55 +0000 (22:25 +0100)]
Remove bogus ZEND_ASSERT(hash != 0)
There's always a possibility that the has will end up as equal to zero due to overflowing.
See the tests for strings whose hash overflow.
Yes, there's a check for whether the hash already was calculated... and strings with a hash equal to zero always need the hash recalculated, in one of 2^32 respectively 2^64 cases - which should not be a major issue.

10 years agodon't expect set/get title symbols are always there
Anatol Belski [Wed, 18 Mar 2015 19:50:54 +0000 (20:50 +0100)]
don't expect set/get title symbols are always there

10 years agoSecond prefetch is useless, because cahce line on modern x86 CPUs is 64 bytes long.
Dmitry Stogov [Wed, 18 Mar 2015 14:11:21 +0000 (17:11 +0300)]
Second prefetch is useless, because cahce line on modern x86 CPUs is 64 bytes long.

10 years agoBetter make this be consistent with DO_ICALL/DO_CALL
Xinchen Hui [Wed, 18 Mar 2015 14:09:57 +0000 (22:09 +0800)]
Better make this be consistent with DO_ICALL/DO_CALL

Revert "Use more specific op type"
This reverts commit 9b07ed6dcc6f0f77fa75ee6a5c2b21298b87f509.

10 years agostrtod shouldn't recognize hex strings
Anatol Belski [Wed, 18 Mar 2015 13:25:40 +0000 (14:25 +0100)]
strtod shouldn't recognize hex strings

10 years agoEnabled global register variables for PPC
Dmitry Stogov [Wed, 18 Mar 2015 13:15:00 +0000 (16:15 +0300)]
Enabled global register variables for PPC

10 years agoUse more specific op type
Xinchen Hui [Wed, 18 Mar 2015 12:56:28 +0000 (20:56 +0800)]
Use more specific op type

10 years agoReimplemented special constant handling. Now __HALT_COMPILER_OFFSET__ is resolved...
Dmitry Stogov [Wed, 18 Mar 2015 12:31:29 +0000 (15:31 +0300)]
Reimplemented special constant handling. Now __HALT_COMPILER_OFFSET__ is resolved at compile-time. __CLASS__ retrived using separate ZEND_FETCH_CLASS_NAME opcode.

10 years agoRevert "Improved zend_get_special_constant"
Dmitry Stogov [Wed, 18 Mar 2015 12:25:27 +0000 (15:25 +0300)]
Revert "Improved zend_get_special_constant"

This reverts commit 624eb49e78b7ae50a85bb4b9c4dc601395fbe71e.

10 years agoMerge branch 'PHP-5.6'
Julien Pauli [Wed, 18 Mar 2015 10:35:04 +0000 (11:35 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Updated NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Julien Pauli [Wed, 18 Mar 2015 10:34:56 +0000 (11:34 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Updated NEWS

10 years agoUpdated NEWS
Julien Pauli [Wed, 18 Mar 2015 10:34:45 +0000 (11:34 +0100)]
Updated NEWS

10 years agoMerge branch 'PHP-5.6'
Julien Pauli [Wed, 18 Mar 2015 09:56:03 +0000 (10:56 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Updated NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Julien Pauli [Wed, 18 Mar 2015 09:55:49 +0000 (10:55 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Updated NEWS

10 years agoUpdated NEWS
Julien Pauli [Wed, 18 Mar 2015 09:55:32 +0000 (10:55 +0100)]
Updated NEWS

10 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Wed, 18 Mar 2015 05:39:28 +0000 (22:39 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  5.4.40 next

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Wed, 18 Mar 2015 05:39:21 +0000 (22:39 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.4.40 next

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Wed, 18 Mar 2015 05:39:10 +0000 (22:39 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.40 next

Conflicts:
configure.in
main/php_version.h

10 years ago5.4.40 next
Stanislav Malyshev [Wed, 18 Mar 2015 05:37:16 +0000 (22:37 -0700)]
5.4.40 next

10 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Wed, 18 Mar 2015 05:04:39 +0000 (22:04 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  update NEWS
  Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary
  oops, no idea how this got in
  Fix bug #69248 - heap overflow vulnerability in regcomp.c
  add test for bug #68976
  add NEWS
  Fixed bug #68976 - Use After Free Vulnerability in unserialize()
  update news
  Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)
  fix tests
  Fix bug #69207 - move_uploaded_file allows nulls in path

Conflicts:
ext/ereg/regex/regcomp.c
ext/standard/basic_functions.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
win32/registry.c

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Wed, 18 Mar 2015 05:02:57 +0000 (22:02 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
  Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary

Conflicts:
ext/zip/lib/zip_dirent.c

10 years agoupdate NEWS
Stanislav Malyshev [Wed, 18 Mar 2015 05:00:53 +0000 (22:00 -0700)]
update NEWS

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Wed, 18 Mar 2015 05:00:29 +0000 (22:00 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary

10 years agoFix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary
Stanislav Malyshev [Wed, 18 Mar 2015 04:59:56 +0000 (21:59 -0700)]
Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary

10 years agoRe-fix tests
Xinchen Hui [Wed, 18 Mar 2015 04:28:27 +0000 (12:28 +0800)]
Re-fix tests

10 years agoRevert "fix tests"
Xinchen Hui [Wed, 18 Mar 2015 04:27:13 +0000 (12:27 +0800)]
Revert "fix tests"

This reverts commit 38e15d89d7b5efdabb599b2894219e3bd9739cfd.

10 years agoRevert "Fixed tests"
Xinchen Hui [Wed, 18 Mar 2015 04:26:56 +0000 (12:26 +0800)]
Revert "Fixed tests"

This reverts commit f57f1a903d7d2bff023c67f17626ddedda918bd4.

10 years agoImproved zend_get_special_constant
Xinchen Hui [Wed, 18 Mar 2015 04:22:07 +0000 (12:22 +0800)]
Improved zend_get_special_constant

10 years agoFixed tests
Xinchen Hui [Wed, 18 Mar 2015 04:19:56 +0000 (12:19 +0800)]
Fixed tests

10 years agoforgot to commit this one
Stanislav Malyshev [Wed, 18 Mar 2015 00:10:49 +0000 (17:10 -0700)]
forgot to commit this one

10 years agoadd test for bug #68976
Stanislav Malyshev [Wed, 18 Mar 2015 00:03:46 +0000 (17:03 -0700)]
add test for bug #68976

10 years agooops, no idea how this got in
Stanislav Malyshev [Wed, 18 Mar 2015 00:13:50 +0000 (17:13 -0700)]
oops, no idea how this got in

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Wed, 18 Mar 2015 00:10:14 +0000 (17:10 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Wed, 18 Mar 2015 00:07:38 +0000 (17:07 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #69248 - heap overflow vulnerability in regcomp.c
  add test for bug #68976

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Wed, 18 Mar 2015 00:08:28 +0000 (17:08 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #69248 - heap overflow vulnerability in regcomp.c
  add test for bug #68976

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Wed, 18 Mar 2015 00:07:38 +0000 (17:07 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #69248 - heap overflow vulnerability in regcomp.c
  add test for bug #68976

10 years agoFix bug #69248 - heap overflow vulnerability in regcomp.c
Stanislav Malyshev [Wed, 18 Mar 2015 00:04:57 +0000 (17:04 -0700)]
Fix bug #69248 - heap overflow vulnerability in regcomp.c

Merged from https://github.com/garyhouston/regex/commit/70bc2965604b6b8aaf260049e64c708dddf85334

10 years agoadd test for bug #68976
Stanislav Malyshev [Wed, 18 Mar 2015 00:03:46 +0000 (17:03 -0700)]
add test for bug #68976

10 years agocomb that header
Anatol Belski [Tue, 17 Mar 2015 23:45:37 +0000 (00:45 +0100)]
comb that header

10 years agofix endianness check plus better visual origin compat
Anatol Belski [Tue, 17 Mar 2015 23:38:19 +0000 (00:38 +0100)]
fix endianness check plus better visual origin compat

10 years agoFixed bug #68976 - Use After Free Vulnerability in unserialize()
Stanislav Malyshev [Tue, 17 Mar 2015 20:20:22 +0000 (13:20 -0700)]
Fixed bug #68976 - Use After Free Vulnerability in unserialize()

10 years agofix tests
Stanislav Malyshev [Fri, 6 Feb 2015 05:54:47 +0000 (21:54 -0800)]
fix tests

10 years agoFix bug #69207 - move_uploaded_file allows nulls in path
Stanislav Malyshev [Tue, 17 Mar 2015 19:47:58 +0000 (12:47 -0700)]
Fix bug #69207 - move_uploaded_file allows nulls in path

10 years agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Tue, 17 Mar 2015 23:17:12 +0000 (02:17 +0300)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  this check isn't applicable anymore

10 years agoGCC prior 4.8.0 may generates wrong code
Dmitry Stogov [Tue, 17 Mar 2015 23:15:49 +0000 (02:15 +0300)]
GCC prior 4.8.0 may generates wrong code

10 years agothis check isn't applicable anymore
Anatol Belski [Tue, 17 Mar 2015 23:14:20 +0000 (00:14 +0100)]
this check isn't applicable anymore

10 years agoFix phpdbg
Nikita Popov [Tue, 17 Mar 2015 21:58:37 +0000 (22:58 +0100)]
Fix phpdbg

10 years agoFixed mess in names
Dmitry Stogov [Tue, 17 Mar 2015 21:13:39 +0000 (00:13 +0300)]
Fixed mess in names

10 years agocatching up with the git history
Anatol Belski [Tue, 17 Mar 2015 20:08:26 +0000 (21:08 +0100)]
catching up with the git history

10 years agofix undefined symbol
Anatol Belski [Tue, 17 Mar 2015 18:57:44 +0000 (19:57 +0100)]
fix undefined symbol

10 years agoupdated NEWS
Anatol Belski [Tue, 17 Mar 2015 18:48:55 +0000 (19:48 +0100)]
updated NEWS

10 years agoadedd test for bug #68797
Anatol Belski [Tue, 17 Mar 2015 18:47:01 +0000 (19:47 +0100)]
adedd test for bug #68797

10 years agorestore freeing stuff and some small improvements
Anatol Belski [Tue, 17 Mar 2015 18:41:43 +0000 (19:41 +0100)]
restore freeing stuff and some small improvements

10 years agofirst shot on updating strtod stuff
Anatol Belski [Tue, 17 Mar 2015 15:13:10 +0000 (16:13 +0100)]
first shot on updating strtod stuff

10 years agoImplement Generator::getReturn()
Nikita Popov [Thu, 19 Feb 2015 19:17:37 +0000 (20:17 +0100)]
Implement Generator::getReturn()

Conflicts:
Zend/zend_vm_execute.h

10 years agoSupport ParseException for require etc
Nikita Popov [Tue, 17 Mar 2015 20:33:57 +0000 (21:33 +0100)]
Support ParseException for require etc

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Tue, 17 Mar 2015 20:24:30 +0000 (13:24 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  add NEWS