]> granicus.if.org Git - php/log
php
9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Tue, 26 Jan 2016 08:22:55 +0000 (16:22 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed bug #71439 (OpenSSL-dependent test fails to skip when openssl not enabled)

9 years agoFixed bug #71439 (OpenSSL-dependent test fails to skip when openssl not enabled)
Xinchen Hui [Tue, 26 Jan 2016 08:22:31 +0000 (16:22 +0800)]
Fixed bug #71439 (OpenSSL-dependent test fails to skip when openssl not enabled)

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Tue, 26 Jan 2016 07:59:32 +0000 (15:59 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Added test for bug #71443

9 years agoAdded test for bug #71443
Xinchen Hui [Tue, 26 Jan 2016 07:59:18 +0000 (15:59 +0800)]
Added test for bug #71443

9 years agoMerge branch 'master' of git.php.net:/php-src
Xinchen Hui [Tue, 26 Jan 2016 07:58:14 +0000 (15:58 +0800)]
Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  add note on readline support
  check for NULL and avoid crashes

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Tue, 26 Jan 2016 07:57:49 +0000 (15:57 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed bug #71443 (Segfault using built-in webserver with intl using symfony)
  Fix memory leak with not freeing OpenSSL errors
  check for NULL and avoid crashes
  Update libmagic.patch for PHP-5.6
  Fixed bug #7143 (finfo throws notice for specific python file)

9 years agoFixed bug #71443 (Segfault using built-in webserver with intl using symfony)
Xinchen Hui [Tue, 26 Jan 2016 07:57:39 +0000 (15:57 +0800)]
Fixed bug #71443 (Segfault using built-in webserver with intl using symfony)

9 years agoadd note on readline support
Anatol Belski [Tue, 26 Jan 2016 07:55:49 +0000 (08:55 +0100)]
add note on readline support

9 years agoMerge branch 'PHP-7.0'
Jakub Zelenka [Mon, 25 Jan 2016 17:20:05 +0000 (17:20 +0000)]
Merge branch 'PHP-7.0'

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Jakub Zelenka [Mon, 25 Jan 2016 17:19:18 +0000 (17:19 +0000)]
Merge branch 'PHP-5.6' into PHP-7.0

9 years agoFix memory leak with not freeing OpenSSL errors
Jakub Zelenka [Mon, 25 Jan 2016 16:50:16 +0000 (16:50 +0000)]
Fix memory leak with not freeing OpenSSL errors

9 years agocheck for NULL and avoid crashes
Antony Dovgal [Mon, 25 Jan 2016 11:29:51 +0000 (14:29 +0300)]
check for NULL and avoid crashes

9 years agocheck for NULL and avoid crashes
Antony Dovgal [Mon, 25 Jan 2016 11:29:51 +0000 (14:29 +0300)]
check for NULL and avoid crashes

9 years agoImprove the names
Xinchen Hui [Mon, 25 Jan 2016 08:00:10 +0000 (16:00 +0800)]
Improve the names

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Mon, 25 Jan 2016 04:13:35 +0000 (12:13 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed bug #71442 (forward_static_call crash)

9 years agoFixed bug #71442 (forward_static_call crash)
Xinchen Hui [Mon, 25 Jan 2016 04:13:22 +0000 (12:13 +0800)]
Fixed bug #71442 (forward_static_call crash)

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Mon, 25 Jan 2016 03:46:42 +0000 (11:46 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Update libmagic.patch for PHP-7.0
  Fixed compiler warnings
  Fixed bug #71434 (finfo throws notice for specific python file)

9 years agoUpdate libmagic.patch for PHP-7.0
Xinchen Hui [Mon, 25 Jan 2016 03:45:20 +0000 (11:45 +0800)]
Update libmagic.patch for PHP-7.0

9 years agoFixed compiler warnings
Xinchen Hui [Mon, 25 Jan 2016 03:42:36 +0000 (11:42 +0800)]
Fixed compiler warnings

9 years agoFixed bug #71434 (finfo throws notice for specific python file)
Xinchen Hui [Mon, 25 Jan 2016 03:40:08 +0000 (11:40 +0800)]
Fixed bug #71434 (finfo throws notice for specific python file)

9 years agoUpdate libmagic.patch for PHP-5.6
Xinchen Hui [Mon, 25 Jan 2016 03:25:04 +0000 (11:25 +0800)]
Update libmagic.patch for PHP-5.6

9 years agoFixed bug #7143 (finfo throws notice for specific python file)
Xinchen Hui [Mon, 25 Jan 2016 03:20:48 +0000 (11:20 +0800)]
Fixed bug #7143 (finfo throws notice for specific python file)

There seems be a bug while it was changed from regexec to
preg_match_impl:
https://github.com/php/php-src/commit/46906925#diff-56e765972d18c84894ea061cfe58076aR1757

9 years agoRemove dead code
Nikita Popov [Sat, 23 Jan 2016 16:58:36 +0000 (17:58 +0100)]
Remove dead code

OP_DATA isn't used in that way anymore

9 years agoRespect RC_INFERENCE during DFG construction
Nikita Popov [Sat, 23 Jan 2016 15:56:27 +0000 (16:56 +0100)]
Respect RC_INFERENCE during DFG construction

To avoid inserting phis that are only relevant with rc inference
enabled. Suprisingly, this affects only 0.8% of phis.

9 years agoDon't insert duplicate predecessors
Nikita Popov [Sat, 23 Jan 2016 15:27:19 +0000 (16:27 +0100)]
Don't insert duplicate predecessors

Otherwise we'll get corrupt phis

9 years agoFix SSA for ZEND_YIELD
Nikita Popov [Fri, 22 Jan 2016 14:38:38 +0000 (15:38 +0100)]
Fix SSA for ZEND_YIELD

Yield-by-ref defs a ref var, yield-by-var only defs an rc1/rcn var
if rc inference is used.

Also move BIND_LEXICAL where it belongs in DFG construction.

9 years agoMerge branch 'PHP-7.0'
Bob Weinand [Sun, 24 Jan 2016 18:55:31 +0000 (19:55 +0100)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #71441 (Typehinted Generator with return in try/finally crashes)
Bob Weinand [Sun, 24 Jan 2016 18:55:16 +0000 (19:55 +0100)]
Fixed bug #71441 (Typehinted Generator with return in try/finally crashes)

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Sun, 24 Jan 2016 11:57:17 +0000 (03:57 -0800)]
Merge branch 'PHP-7.0'

9 years agoFixed Bug #71435 (Reproducible crash using opcache.file_cache_only=1 and class constant)
Xinchen Hui [Sun, 24 Jan 2016 11:56:47 +0000 (03:56 -0800)]
Fixed Bug #71435 (Reproducible crash using opcache.file_cache_only=1 and class constant)

9 years agoFixed warning of incompatible pointer
Xinchen Hui [Sun, 24 Jan 2016 06:49:15 +0000 (22:49 -0800)]
Fixed warning of incompatible pointer

9 years agoMerge branch 'PHP-7.0'
Bob Weinand [Sat, 23 Jan 2016 17:17:18 +0000 (18:17 +0100)]
Merge branch 'PHP-7.0'

9 years agoUse uint64_t for flags (warning)
Bob Weinand [Sat, 23 Jan 2016 17:16:57 +0000 (18:16 +0100)]
Use uint64_t for flags (warning)

9 years agoUpdate NEWS and UPGRADING for PR #1701
Jakub Zelenka [Fri, 22 Jan 2016 19:39:16 +0000 (19:39 +0000)]
Update NEWS and UPGRADING for PR #1701

9 years agojson_encode: Escape U+2028 and U+2029 more often.
Eddie Kohler [Tue, 29 Dec 2015 00:05:09 +0000 (19:05 -0500)]
json_encode: Escape U+2028 and U+2029 more often.

These characters are illegal in Javascript, so leaving them unescaped
is risky. The default encoder ($flags = 0) is fine, but the encoder
with JSON_UNESCAPED_UNICODE flag is not.

In case anyone wants the ability to leave these characters unescaped,
provide JSON_UNESCAPED_LINE_TERMINATORS.

9 years agoMore accurate handling of isset() and unset()
Dmitry Stogov [Fri, 22 Jan 2016 10:32:20 +0000 (13:32 +0300)]
More accurate handling of isset() and unset()

9 years agoAdded optimization constraint (don't optimize result of NEW, because constructor...
Dmitry Stogov [Fri, 22 Jan 2016 10:30:34 +0000 (13:30 +0300)]
Added optimization constraint (don't optimize result of NEW, because constructor may throw exception)

9 years agoReturn meaningful value
Xinchen Hui [Fri, 22 Jan 2016 07:34:56 +0000 (15:34 +0800)]
Return meaningful value

9 years agoWe don't need to dup zend_class_constant here.
Xinchen Hui [Fri, 22 Jan 2016 03:22:37 +0000 (11:22 +0800)]
We don't need to dup zend_class_constant here.

quote why the internal class is still using duplication:
```
for internal classes, the zend_class_constant is malloc-ed. we need to
free it.

if (const->ce == ce) {
zval_ptr_dtor(&const->value);
free(const)
}
so, if two classes share one const, and it(parent class) was freed
before, this read(in child class, const->ce) is invalid..

and destroy_zend_class is called via zend_hash_destroy(class_table).
which is not in reverse order... so, parent classes are dtor first.

if we want this work, we should change that order.
```

9 years agoMake op1/op2 decoding in phpdbg more complete
Nikita Popov [Thu, 21 Jan 2016 20:28:02 +0000 (21:28 +0100)]
Make op1/op2 decoding in phpdbg more complete

9 years agoDon't print try-catch offset for FAST_RET w/o ev
Nikita Popov [Thu, 21 Jan 2016 20:52:50 +0000 (21:52 +0100)]
Don't print try-catch offset for FAST_RET w/o ev

9 years agoMark op1 of INIT_FCALL as NUM
Nikita Popov [Thu, 21 Jan 2016 20:30:45 +0000 (21:30 +0100)]
Mark op1 of INIT_FCALL as NUM

9 years agoConsolidate op1/op2 vm flags
Nikita Popov [Thu, 21 Jan 2016 20:13:43 +0000 (21:13 +0100)]
Consolidate op1/op2 vm flags

9 years agoAdd missing macro
Andrey Hristov [Thu, 21 Jan 2016 11:59:23 +0000 (12:59 +0100)]
Add missing macro

9 years agoTypo (SKIPF -> SKIPIF)
Xinchen Hui [Thu, 21 Jan 2016 07:27:53 +0000 (15:27 +0800)]
Typo (SKIPF -> SKIPIF)

9 years agoEmpty line
Xinchen Hui [Thu, 21 Jan 2016 06:37:54 +0000 (14:37 +0800)]
Empty line

9 years agoCover overloaded functions
Xinchen Hui [Thu, 21 Jan 2016 06:31:03 +0000 (14:31 +0800)]
Cover overloaded functions

9 years agoLet's add a class entry for testing
Xinchen Hui [Thu, 21 Jan 2016 05:53:29 +0000 (13:53 +0800)]
Let's add a class entry for testing

9 years agoMerge branch 'master' of git.php.net:/php-src
Xinchen Hui [Thu, 21 Jan 2016 05:32:08 +0000 (13:32 +0800)]
Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  re-arrange NEWS
  5.6.19 will be next
  Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message) Fix skip message to work
  fix ReflectionClass::__toString doc block omitted
  fix ReflectionClass::__toString doc block omitted
  improve fix for bug #71201
  improve fix for bug #71201

9 years agoFixed bug #71413 (Crash with constants on internal interfaces)
Xinchen Hui [Thu, 21 Jan 2016 05:30:41 +0000 (13:30 +0800)]
Fixed bug #71413 (Crash with constants on internal interfaces)

9 years agoMerge branch 'PHP-7.0'
Ferenc Kovacs [Thu, 21 Jan 2016 01:25:39 +0000 (02:25 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  re-arrange NEWS

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Thu, 21 Jan 2016 01:25:23 +0000 (02:25 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  re-arrange NEWS

9 years agore-arrange NEWS
Ferenc Kovacs [Thu, 21 Jan 2016 01:24:51 +0000 (02:24 +0100)]
re-arrange NEWS

9 years agoMerge branch 'PHP-7.0'
Ferenc Kovacs [Wed, 20 Jan 2016 14:43:49 +0000 (15:43 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  5.6.19 will be next

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Wed, 20 Jan 2016 14:43:15 +0000 (15:43 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  5.6.19 will be next

9 years ago5.6.19 will be next
Ferenc Kovacs [Wed, 20 Jan 2016 14:39:05 +0000 (15:39 +0100)]
5.6.19 will be next

9 years agoMerge branch 'PHP-7.0'
Remi Collet [Wed, 20 Jan 2016 12:11:13 +0000 (13:11 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message) Fix skip message to work
  fix ReflectionClass::__toString doc block omitted

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Remi Collet [Wed, 20 Jan 2016 12:10:56 +0000 (13:10 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message) Fix skip message to work

9 years agoFix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message)
Remi Collet [Wed, 20 Jan 2016 12:08:58 +0000 (13:08 +0100)]
Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message)
Fix skip message to work

9 years agoMerge branch 'master' of https://github.com/php/php-src
Joe Watkins [Wed, 20 Jan 2016 10:55:09 +0000 (10:55 +0000)]
Merge branch 'master' of https://github.com/php/php-src

9 years agofix ReflectionClass::__toString doc block omitted
Joe Watkins [Wed, 20 Jan 2016 10:52:27 +0000 (10:52 +0000)]
fix ReflectionClass::__toString doc block omitted

9 years agoMerge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
Joe Watkins [Wed, 20 Jan 2016 10:52:57 +0000 (10:52 +0000)]
Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0

9 years agofix ReflectionClass::__toString doc block omitted
Joe Watkins [Wed, 20 Jan 2016 10:52:27 +0000 (10:52 +0000)]
fix ReflectionClass::__toString doc block omitted

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Wed, 20 Jan 2016 08:46:58 +0000 (09:46 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  improve fix for bug #71201
  improve fix for bug #71201

9 years agoimprove fix for bug #71201
Anatol Belski [Wed, 20 Jan 2016 08:46:09 +0000 (09:46 +0100)]
improve fix for bug #71201

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Wed, 20 Jan 2016 08:45:49 +0000 (09:45 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  improve fix for bug #71201

9 years agoimprove fix for bug #71201
Anatol Belski [Wed, 20 Jan 2016 08:44:28 +0000 (09:44 +0100)]
improve fix for bug #71201

9 years agoMark isset($$var) as INDIRECT_VAR_ACCESS
Nikita Popov [Tue, 19 Jan 2016 21:25:21 +0000 (22:25 +0100)]
Mark isset($$var) as INDIRECT_VAR_ACCESS

9 years agoAdd support for Pi type constraints
Nikita Popov [Sat, 9 Jan 2016 17:42:07 +0000 (18:42 +0100)]
Add support for Pi type constraints

Supports TYPE_CHECK and IS_IDENTICAL for now.

9 years agoTypo (ASSESS->ACCESS)
Dmitry Stogov [Tue, 19 Jan 2016 12:54:44 +0000 (15:54 +0300)]
Typo (ASSESS->ACCESS)

9 years agoUse ZEND_FUNC_INDIRECT_VAR_ASSESS instead of ZEND_FUNC_TOO_DYNAMIC. Handle function...
Dmitry Stogov [Tue, 19 Jan 2016 12:33:08 +0000 (15:33 +0300)]
Use ZEND_FUNC_INDIRECT_VAR_ASSESS instead of ZEND_FUNC_TOO_DYNAMIC. Handle function with exceptions handlers and generators separately.

9 years agovc doesn't support #warning
Anatol Belski [Tue, 19 Jan 2016 11:14:59 +0000 (12:14 +0100)]
vc doesn't support #warning

9 years agoreorder comments
Anatol Belski [Tue, 19 Jan 2016 08:04:52 +0000 (09:04 +0100)]
reorder comments

9 years agoget rid of win32_ prefix
Anatol Belski [Tue, 19 Jan 2016 08:02:12 +0000 (09:02 +0100)]
get rid of win32_ prefix

9 years agocheck return values and cleanup the job object on exit
Anatol Belski [Tue, 19 Jan 2016 07:57:58 +0000 (08:57 +0100)]
check return values and cleanup the job object on exit

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Tue, 19 Jan 2016 07:04:40 +0000 (08:04 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  add 7.0.4 block to NEWS
  bump version to 7.0.4-dev

9 years agoadd 7.0.4 block to NEWS
Anatol Belski [Tue, 19 Jan 2016 07:03:44 +0000 (08:03 +0100)]
add 7.0.4 block to NEWS

9 years agobump version to 7.0.4-dev
Anatol Belski [Tue, 19 Jan 2016 07:02:39 +0000 (08:02 +0100)]
bump version to 7.0.4-dev

9 years agotrap also children exits on shutdown to avoid unhandled exceptions
Anatol Belski [Mon, 18 Jan 2016 19:52:17 +0000 (20:52 +0100)]
trap also children exits on shutdown to avoid unhandled exceptions

9 years agointegrate the /Gw compiler switch
Anatol Belski [Mon, 18 Jan 2016 17:31:04 +0000 (18:31 +0100)]
integrate the /Gw compiler switch

9 years agofix compiler version check
Anatol Belski [Mon, 18 Jan 2016 17:08:49 +0000 (18:08 +0100)]
fix compiler version check

9 years agointegrate /Zc:inline switch
Anatol Belski [Mon, 18 Jan 2016 17:05:34 +0000 (18:05 +0100)]
integrate /Zc:inline switch

9 years agoadd proper noinline specifier for VC
Anatol Belski [Mon, 18 Jan 2016 16:35:23 +0000 (17:35 +0100)]
add proper noinline specifier for VC

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Mon, 18 Jan 2016 17:24:42 +0000 (18:24 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix test for 7.0, OpenSSL >= 1.0.2 disables SSLv2 by default

9 years agofix test for 7.0, OpenSSL >= 1.0.2 disables SSLv2 by default
Anatol Belski [Mon, 18 Jan 2016 17:23:07 +0000 (18:23 +0100)]
fix test for 7.0, OpenSSL >= 1.0.2 disables SSLv2 by default

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Mon, 18 Jan 2016 16:02:58 +0000 (17:02 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fork test
  fix test
  fork test
  fork test for win32
  fork test

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Mon, 18 Jan 2016 16:02:23 +0000 (17:02 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fork test
  fix test
  fork test
  fork test for win32
  fork test

9 years agofork test
Anatol Belski [Mon, 18 Jan 2016 15:59:17 +0000 (16:59 +0100)]
fork test

9 years agofix test
Anatol Belski [Mon, 18 Jan 2016 15:52:48 +0000 (16:52 +0100)]
fix test

9 years agofork test
Anatol Belski [Mon, 18 Jan 2016 15:45:35 +0000 (16:45 +0100)]
fork test

9 years agofork test for win32
Anatol Belski [Mon, 18 Jan 2016 15:37:04 +0000 (16:37 +0100)]
fork test for win32

9 years agofork test
Anatol Belski [Mon, 18 Jan 2016 15:34:20 +0000 (16:34 +0100)]
fork test

9 years agoadd UPGRADING note for PHP_FCGI_CHILDREN on Windows
Anatol Belski [Mon, 18 Jan 2016 07:26:23 +0000 (08:26 +0100)]
add UPGRADING note for PHP_FCGI_CHILDREN on Windows

9 years agoMerge branch 'PHP-7.0'
Yasuo Ohgaki [Mon, 18 Jan 2016 04:35:43 +0000 (13:35 +0900)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Use SUCCESS/FAILURE

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Yasuo Ohgaki [Mon, 18 Jan 2016 04:35:01 +0000 (13:35 +0900)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Use SUCCESS/FAILURE

9 years agoUse SUCCESS/FAILURE
Yasuo Ohgaki [Mon, 18 Jan 2016 04:27:52 +0000 (13:27 +0900)]
Use SUCCESS/FAILURE

9 years agoFixed bug #71070 Custom session handler write method returns false, warning message...
Yasuo Ohgaki [Mon, 18 Jan 2016 03:03:41 +0000 (12:03 +0900)]
Fixed bug #71070 Custom session handler write method returns false, warning message misleading
This is commited to master only.
If you have better error message suggestion, feel free to improve it.

9 years agoFixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test
Yasuo Ohgaki [Mon, 18 Jan 2016 01:51:29 +0000 (10:51 +0900)]
Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test

9 years agoMerge branch 'PHP-7.0'
Yasuo Ohgaki [Mon, 18 Jan 2016 01:52:48 +0000 (10:52 +0900)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Yasuo Ohgaki [Mon, 18 Jan 2016 01:52:11 +0000 (10:52 +0900)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test