]> granicus.if.org Git - php/log
php
10 years agoAvoid extra function call on hot path
Dmitry Stogov [Mon, 9 Jun 2014 11:41:29 +0000 (15:41 +0400)]
Avoid extra function call on hot path

10 years agoFixed DOM tests when using libxml2 versions patched against CVE-2014-0191
Matteo Beccati [Wed, 4 Jun 2014 11:26:24 +0000 (13:26 +0200)]
Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191

DOMDocument::substituteEntities needs to be set to true in order for
external entities to be parsed.

10 years agoBundle pcre-8.35 with sljit support
Dmitry Stogov [Fri, 6 Jun 2014 14:46:19 +0000 (18:46 +0400)]
Bundle pcre-8.35 with sljit support

10 years agoIntroduced new BIND_GLOBAL instraction instead of FETCH_W+ASSIGN_REF pair that caused...
Dmitry Stogov [Fri, 6 Jun 2014 11:04:30 +0000 (15:04 +0400)]
Introduced new BIND_GLOBAL instraction instead of FETCH_W+ASSIGN_REF pair that caused a lot of useles checks

10 years agoGC doesn't count scalars and immutable arrays in the same way
Dmitry Stogov [Thu, 5 Jun 2014 17:05:07 +0000 (21:05 +0400)]
GC doesn't count scalars and immutable arrays in the same way

10 years agoFixed compilation warnings
Dmitry Stogov [Thu, 5 Jun 2014 16:58:21 +0000 (20:58 +0400)]
Fixed compilation warnings

10 years agoMerge branch 'master' into phpng
Dmitry Stogov [Thu, 5 Jun 2014 16:54:50 +0000 (20:54 +0400)]
Merge branch 'master' into phpng

* master: (29 commits)
  drop exec perm on doc files
  fix test for 5.4/5.5
  restore correct behavior of DateTime
  fix test use invalid code
  add test for previous fix
  NEWS
  NEWS
  NEWS
  Fix regression introduce in fix for bug #67118
  update news
  update NEWS
  Fix tests
  Fix possible segfault depending on memory location...
  Fixed startup segfault in non-debug builds Fixes issue #87
  PHP 5.4/5.5 compability in phpdbg_watch.c
  fix gcov data with some locales (again)
  fix gcov data with some locales (again)
  fix gcov data with some locales (again)
  Update NEWS
  Fixed startup segfault in non-debug builds Fixes issue #87
  ...

10 years agoMerge branch 'PHP-5.6'
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
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
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
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
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
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
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
Remi Collet [Thu, 5 Jun 2014 15:33:40 +0000 (17:33 +0200)]
fix test for 5.4/5.5

10 years agoSpeedup string equality check
Dmitry Stogov [Thu, 5 Jun 2014 15:14:47 +0000 (19:14 +0400)]
Speedup string equality check

10 years agoSimplify code
Dmitry Stogov [Thu, 5 Jun 2014 14:42:17 +0000 (18:42 +0400)]
Simplify code

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

10 years agoUse reference counting instead of zval duplication
Dmitry Stogov [Thu, 5 Jun 2014 12:04:11 +0000 (16:04 +0400)]
Use reference counting instead of zval duplication

10 years agofix test use invalid code
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'
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
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
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
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'
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
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
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
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
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
Remi Collet [Thu, 5 Jun 2014 11:45:25 +0000 (13:45 +0200)]
NEWS

10 years agoFix regression introduce in fix for bug #67118
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'
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
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
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
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
Stanislav Malyshev [Wed, 4 Jun 2014 08:09:37 +0000 (01:09 -0700)]
update NEWS

10 years agoReference counters in PHPNG may have different values
Dmitry Stogov [Wed, 4 Jun 2014 05:57:17 +0000 (09:57 +0400)]
Reference counters in PHPNG may have different values

10 years agoMerge branch 'PHP-5.6'
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
Bob Weinand [Wed, 4 Jun 2014 00:18:39 +0000 (02:18 +0200)]
Merge sapi/phpdbg into PHP-5.6

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

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

10 years agoAvoid useless merge
Dmitry Stogov [Tue, 3 Jun 2014 22:11:26 +0000 (02:11 +0400)]
Avoid useless merge

10 years agoFixed startup segfault in non-debug builds
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
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)
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)
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)
Nuno Lopes [Tue, 3 Jun 2014 21:21:20 +0000 (17:21 -0400)]
fix gcov data with some locales (again)

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

10 years agoMerge sapi/phpdbg into PHP-5.6
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
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'
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
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
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
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'
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...
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'
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
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
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
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 agoSimplified and optimized ZEND_HANDLE_NUMERIC()
Dmitry Stogov [Tue, 3 Jun 2014 09:10:42 +0000 (13:10 +0400)]
Simplified and optimized ZEND_HANDLE_NUMERIC()

10 years agoMerge branch 'PHP-5.6'
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
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
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
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
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
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
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'
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
Ferenc Kovacs [Tue, 3 Jun 2014 08:27:42 +0000 (10:27 +0200)]
add NEWS block for 5.6.0RC1

10 years agoOptimized conditions order
Dmitry Stogov [Tue, 3 Jun 2014 05:45:09 +0000 (09:45 +0400)]
Optimized conditions order

10 years agoOptimized conditions order
Dmitry Stogov [Mon, 2 Jun 2014 23:54:03 +0000 (03:54 +0400)]
Optimized conditions order

10 years agoAvoid copying of immutable arrays
Dmitry Stogov [Mon, 2 Jun 2014 22:43:53 +0000 (02:43 +0400)]
Avoid copying of immutable arrays

10 years agocleanup
Dmitry Stogov [Mon, 2 Jun 2014 22:43:31 +0000 (02:43 +0400)]
cleanup

10 years agocleanup
Dmitry Stogov [Mon, 2 Jun 2014 20:36:31 +0000 (00:36 +0400)]
cleanup

10 years agoFixed merge
Xinchen Hui [Sun, 1 Jun 2014 15:14:31 +0000 (23:14 +0800)]
Fixed merge

10 years agoMerge branch 'master' into phpng
Xinchen Hui [Sun, 1 Jun 2014 14:29:41 +0000 (22:29 +0800)]
Merge branch 'master' into phpng

Conflicts:
ext/spl/spl_array.c
ext/spl/spl_directory.c
ext/standard/formatted_print.c

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

10 years agoUpdate NEWs
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
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
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
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)
Xinchen Hui [Sun, 1 Jun 2014 11:41:01 +0000 (19:41 +0800)]
Fixed bug #67359 (Segfault in recursiveDirectoryIterator)

10 years agoImproved conditions order
Dmitry Stogov [Fri, 30 May 2014 10:40:19 +0000 (14:40 +0400)]
Improved conditions order

10 years agoMerge branch 'phpng' of git.php.net:php-src into phpng
Dmitry Stogov [Fri, 30 May 2014 07:13:19 +0000 (11:13 +0400)]
Merge branch 'phpng' of git.php.net:php-src into phpng

* 'phpng' of git.php.net:php-src:
  typo
  Revert "Fix ArrayObject with immutable array"
  Fix ArrayObject with immutable array

10 years agoAvoid useless duplication of immutable arrays
Dmitry Stogov [Fri, 30 May 2014 07:12:24 +0000 (11:12 +0400)]
Avoid useless duplication of immutable arrays

10 years agoAvoid in-place modification
Dmitry Stogov [Fri, 30 May 2014 07:12:03 +0000 (11:12 +0400)]
Avoid in-place modification

10 years agotypo
Xinchen Hui [Fri, 30 May 2014 06:56:50 +0000 (14:56 +0800)]
typo

10 years agoRevert "Fix ArrayObject with immutable array"
Nikita Popov [Thu, 29 May 2014 19:49:54 +0000 (21:49 +0200)]
Revert "Fix ArrayObject with immutable array"

This reverts commit 9c85aa0489671e6cec43406161c558567e5b7336.

10 years agoFix ArrayObject with immutable array
Nikita Popov [Thu, 29 May 2014 19:19:49 +0000 (21:19 +0200)]
Fix ArrayObject with immutable array

10 years agoMerge branch 'PHP-5.6'
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
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
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.
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 agoIntroduced immutable arrays. They don't need to be copyed and may be used directly...
Dmitry Stogov [Thu, 29 May 2014 14:21:56 +0000 (18:21 +0400)]
Introduced immutable arrays. They don't need to be copyed and may be used directly from SHM.

10 years agoFix length reset in JSON parser
Nikita Popov [Thu, 29 May 2014 10:53:32 +0000 (12:53 +0200)]
Fix length reset in JSON parser

10 years agoFix $http_response_header creation
Nikita Popov [Thu, 29 May 2014 10:51:03 +0000 (12:51 +0200)]
Fix $http_response_header creation

10 years agoImprove gdb ht and zval dumps
Nikita Popov [Thu, 29 May 2014 10:47:40 +0000 (12:47 +0200)]
Improve gdb ht and zval dumps

10 years agoImprove class constant fetch fix
Nikita Popov [Thu, 29 May 2014 09:17:33 +0000 (11:17 +0200)]
Improve class constant fetch fix

Dereference the cached constant for Test::TEST as well (and not just
self::TEST).

Also improve the phpt file to test this case as well - previously
this only manifested with opcache enabled, due to literal sharing.

Additionally the Z_TYPE_P != IS_REFERENCE assertion is now moved
into the TMP_VAR fetching code (as it applies to more than just
property assignments.)

10 years agoFix class constant fetching
Nikita Popov [Wed, 28 May 2014 22:02:13 +0000 (00:02 +0200)]
Fix class constant fetching

If a class is extended after the constant fetch has been cached
the cached value will be turned into a reference. On the next
fetch the polymorphic cache will return this reference, which
will be directly returned. The object assignment code then
dereferences this result and performs a shallow copy, which is
invalid for references. This subsequently leads to the constant
value being prematurely freed.

This is fixed by dereferencing the value returned from the
polymorphic cache. Furthermore the incorrect dereference from
in the object assignment code is replaced with an assertion that
we're dealing with a non-reference, so ensure that this kind of
problem cannot go unnoticed in the future.