]> granicus.if.org Git - php/log
php
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

10 years agoadd NEWS
Stanislav Malyshev [Tue, 17 Mar 2015 20:24:17 +0000 (13:24 -0700)]
add NEWS

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

* PHP-5.5:
  Fixed bug #68976 - Use After Free Vulnerability in unserialize()

Conflicts:
ext/standard/var_unserializer.c

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

* PHP-5.4:
  Fixed bug #68976 - Use After Free Vulnerability in unserialize()

Conflicts:
ext/standard/var_unserializer.c

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 agoFixed zend_hash_del()
Dmitry Stogov [Tue, 17 Mar 2015 20:13:39 +0000 (23:13 +0300)]
Fixed zend_hash_del()

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

* PHP-5.5:
  update news
  Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)

10 years agoupdate news
Stanislav Malyshev [Tue, 17 Mar 2015 20:07:40 +0000 (13:07 -0700)]
update news

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

* PHP-5.4:
  Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)

10 years agoFixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)
Stanislav Malyshev [Tue, 17 Mar 2015 20:04:36 +0000 (13:04 -0700)]
Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Tue, 17 Mar 2015 19:58:00 +0000 (12:58 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix tests
  Fix bug #69207 - move_uploaded_file allows nulls in path

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Tue, 17 Mar 2015 19:56:37 +0000 (12:56 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix tests

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

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Tue, 17 Mar 2015 19:48:37 +0000 (12:48 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #69207 - move_uploaded_file allows nulls in path

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 agoEmbed "fast" operator functions (add, sub, increment, etc) into executor with additio...
Dmitry Stogov [Tue, 17 Mar 2015 15:53:19 +0000 (18:53 +0300)]
Embed "fast" operator functions (add, sub, increment, etc) into executor with additional optimizations

10 years agoEnable GCC global register variables if available
Dmitry Stogov [Tue, 17 Mar 2015 10:51:02 +0000 (13:51 +0300)]
Enable GCC global register variables if available

10 years agoUpdated NEWS
Julien Pauli [Tue, 17 Mar 2015 10:07:15 +0000 (11:07 +0100)]
Updated NEWS

10 years agoAdd wifcontinued and wcontinued for pcntl
julien.pons [Mon, 23 Feb 2015 13:38:55 +0000 (14:38 +0100)]
Add wifcontinued and wcontinued for pcntl

10 years agoMerge branch 'PHP-5.6'
Anatol Belski [Tue, 17 Mar 2015 08:22:11 +0000 (09:22 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  Fixed bug #65406 Enchant broker plugins are in the wrong place in windows

10 years agoupdated NEWS
Anatol Belski [Tue, 17 Mar 2015 08:21:38 +0000 (09:21 +0100)]
updated NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Tue, 17 Mar 2015 08:20:54 +0000 (09:20 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #65406 Enchant broker plugins are in the wrong place in windows

10 years agoFixed bug #65406 Enchant broker plugins are in the wrong place in windows
Anatol Belski [Tue, 17 Mar 2015 08:20:16 +0000 (09:20 +0100)]
Fixed bug #65406 Enchant broker plugins are in the wrong place in windows

10 years agouse default test timeout
Anatol Belski [Mon, 16 Mar 2015 22:07:33 +0000 (23:07 +0100)]
use default test timeout

10 years agotest fixes + added skipif for slow tests
Anatol Belski [Mon, 16 Mar 2015 20:55:40 +0000 (13:55 -0700)]
test fixes + added skipif for slow tests

10 years agouse busy sleep instead of sleep() for timeout tests
Anatol Belski [Mon, 16 Mar 2015 20:21:33 +0000 (13:21 -0700)]
use busy sleep instead of sleep() for timeout tests

10 years agoremove ext/mysql enablement from travis build
Anatol Belski [Mon, 16 Mar 2015 19:05:40 +0000 (20:05 +0100)]
remove ext/mysql enablement from travis build

10 years agotest timeout with shutdown function, variation
Anatol Belski [Mon, 16 Mar 2015 18:37:07 +0000 (19:37 +0100)]
test timeout with shutdown function, variation

10 years agotest timeout with shutdown function
Anatol Belski [Mon, 16 Mar 2015 18:35:36 +0000 (19:35 +0100)]
test timeout with shutdown function

10 years agotest timeout with foreach loop
Anatol Belski [Mon, 16 Mar 2015 18:30:04 +0000 (19:30 +0100)]
test timeout with foreach loop

10 years agotest timeout with for loop
Anatol Belski [Mon, 16 Mar 2015 18:28:01 +0000 (19:28 +0100)]
test timeout with for loop

10 years agotest timeout with exception variation
Anatol Belski [Mon, 16 Mar 2015 18:26:17 +0000 (19:26 +0100)]
test timeout with exception variation

10 years agotest timeout with exception
Anatol Belski [Mon, 16 Mar 2015 18:21:58 +0000 (19:21 +0100)]
test timeout with exception

10 years agofix timeout with cal_user_func
Anatol Belski [Mon, 16 Mar 2015 18:16:09 +0000 (19:16 +0100)]
fix timeout with cal_user_func

10 years agotest timeout within eval()
Anatol Belski [Mon, 16 Mar 2015 18:12:55 +0000 (19:12 +0100)]
test timeout within eval()

10 years agotest timeout with array_walk
Anatol Belski [Mon, 16 Mar 2015 18:05:21 +0000 (19:05 +0100)]
test timeout with array_walk

10 years agotest timeout within function
Anatol Belski [Mon, 16 Mar 2015 18:01:23 +0000 (19:01 +0100)]
test timeout within function

10 years agotest timeout within while loop
Anatol Belski [Mon, 16 Mar 2015 17:58:32 +0000 (18:58 +0100)]
test timeout within while loop

10 years agoimproved timeout handling on windows
Dmitry Stogov [Mon, 16 Mar 2015 16:48:29 +0000 (17:48 +0100)]
improved timeout handling on windows

10 years agoMerge branch 'PHP-5.6'
Julien Pauli [Mon, 16 Mar 2015 15:11:02 +0000 (16:11 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix flaws in session module

Conflicts:
ext/session/session.c

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Julien Pauli [Mon, 16 Mar 2015 15:01:12 +0000 (16:01 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix flaws in session module

10 years agoFix flaws in session module
Julien Pauli [Mon, 16 Mar 2015 15:00:46 +0000 (16:00 +0100)]
Fix flaws in session module

10 years agoUse memcmp() instead of strncmp()
Dmitry Stogov [Mon, 16 Mar 2015 12:53:54 +0000 (15:53 +0300)]
Use memcmp() instead of strncmp()

10 years agoImproved parser (make use_type reuseable)
Xinchen Hui [Mon, 16 Mar 2015 10:43:21 +0000 (18:43 +0800)]
Improved parser (make use_type reuseable)

10 years agoLet phpdbg refused to be compiled with no CALL zend vm kind
Xinchen Hui [Mon, 16 Mar 2015 09:10:26 +0000 (17:10 +0800)]
Let phpdbg refused to be compiled with no CALL zend vm kind

10 years agoExposed ZEND_VM_KIND etc
Xinchen Hui [Mon, 16 Mar 2015 09:00:04 +0000 (17:00 +0800)]
Exposed ZEND_VM_KIND etc

10 years agoRemove --with-zend-vm (it doesn't work anyway)
Xinchen Hui [Mon, 16 Mar 2015 08:59:31 +0000 (16:59 +0800)]
Remove --with-zend-vm (it doesn't work anyway)

10 years agoMerge branch 'PHP-5.6'
Anatol Belski [Mon, 16 Mar 2015 07:35:10 +0000 (08:35 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  backport af2b0669 into 5.5

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Mon, 16 Mar 2015 07:34:14 +0000 (08:34 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  backport af2b0669 into 5.5

10 years agobackport af2b0669 into 5.5
Anatol Belski [Mon, 16 Mar 2015 07:32:39 +0000 (08:32 +0100)]
backport af2b0669 into 5.5