]> granicus.if.org Git - php/log
php
9 years agoMerge branch 'PHP-7.0'
Reeze Xia [Thu, 5 Nov 2015 06:30:20 +0000 (14:30 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Make test for bug #70852 to cover all cases
  Fixed bug #70852 Segfault getting NULL offset of an ArrayObject.

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Reeze Xia [Thu, 5 Nov 2015 06:28:49 +0000 (14:28 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Make test for bug #70852 to cover all cases
  Fixed bug #70852 Segfault getting NULL offset of an ArrayObject.

9 years agoMake test for bug #70852 to cover all cases
Reeze Xia [Thu, 5 Nov 2015 06:09:24 +0000 (14:09 +0800)]
Make test for bug #70852 to cover all cases

9 years agoFixed bug #70852 Segfault getting NULL offset of an ArrayObject.
Reeze Xia [Thu, 5 Nov 2015 05:46:03 +0000 (13:46 +0800)]
Fixed bug #70852 Segfault getting NULL offset of an ArrayObject.

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Wed, 4 Nov 2015 14:44:48 +0000 (06:44 -0800)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #70853 (SplFixedArray throws exception when using ref variable as index)
Xinchen Hui [Wed, 4 Nov 2015 14:44:29 +0000 (06:44 -0800)]
Fixed bug #70853 (SplFixedArray throws exception when using ref variable as index)

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Wed, 4 Nov 2015 11:01:31 +0000 (19:01 +0800)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #70843 (Segmentation fault on MacOSX with opcache.file_cache_only=1)
Xinchen Hui [Wed, 4 Nov 2015 10:59:30 +0000 (18:59 +0800)]
Fixed bug #70843 (Segmentation fault on MacOSX with opcache.file_cache_only=1)

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Wed, 4 Nov 2015 01:56:05 +0000 (17:56 -0800)]
Merge branch 'PHP-7.0'

Conflicts:
Zend/zend_vm_execute.h

9 years agoFixed bug #70805 (Segmentation faults whilst running Drupal 8 test suite)
Xinchen Hui [Wed, 4 Nov 2015 01:53:56 +0000 (17:53 -0800)]
Fixed bug #70805 (Segmentation faults whilst running Drupal 8 test suite)

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Mon, 2 Nov 2015 08:43:52 +0000 (16:43 +0800)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #70540 (sapi/fpm/tests/008.phpt and 016.phpt should be skipped on some...
Xinchen Hui [Mon, 2 Nov 2015 08:43:28 +0000 (16:43 +0800)]
Fixed bug #70540 (sapi/fpm/tests/008.phpt and 016.phpt should be skipped on some platforms)

9 years agoAdd test_fpm_conf to skip some tests ranth than mark --xfail--
Xinchen Hui [Mon, 2 Nov 2015 08:35:54 +0000 (16:35 +0800)]
Add test_fpm_conf to skip some tests ranth than mark --xfail--

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Mon, 2 Nov 2015 02:59:11 +0000 (10:59 +0800)]
Merge branch 'PHP-7.0'

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Xinchen Hui [Mon, 2 Nov 2015 02:59:07 +0000 (10:59 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0

9 years agoFixed test
Xinchen Hui [Mon, 2 Nov 2015 02:58:55 +0000 (10:58 +0800)]
Fixed test

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Mon, 2 Nov 2015 02:55:33 +0000 (10:55 +0800)]
Merge branch 'PHP-7.0'

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Xinchen Hui [Mon, 2 Nov 2015 02:55:05 +0000 (10:55 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0

9 years agoMerge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
Xinchen Hui [Mon, 2 Nov 2015 02:47:32 +0000 (10:47 +0800)]
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6

9 years agoFixed bug #70828 (php-fpm 5.6 with opcache crashes when referencing a non-existent...
Xinchen Hui [Mon, 2 Nov 2015 02:47:02 +0000 (10:47 +0800)]
Fixed bug #70828 (php-fpm 5.6 with opcache crashes when referencing a non-existent constant)

9 years agoUse standard title for new openssl tests
Jakub Zelenka [Thu, 29 Oct 2015 19:11:57 +0000 (19:11 +0000)]
Use standard title for new openssl tests

9 years agonew tests to openssl module, don't covered yet.
root [Thu, 29 Oct 2015 14:05:54 +0000 (12:05 -0200)]
new tests to openssl module, don't covered yet.

9 years agoAnother Fix for Bug #68344 MySQLi does not provide way to disable peer certificate...
Andrey Hristov [Tue, 27 Oct 2015 11:59:09 +0000 (12:59 +0100)]
Another Fix for Bug #68344  MySQLi does not provide way to disable peer certificate validation
Added the possibility to explicitly state that the peer certificate should not be checked.
Back to the default - checking the certificate.
Exported MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT
Usage : mysqli_real_connect( , , , , , MYSQLI_CLIENT_SSL | MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT)

If mysqli_ssl_set() is not called, but only MYSQLI_CLIENT_SSL is passed, without the (don't) very flag,
then no verification takes place.

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Tue, 27 Oct 2015 00:29:22 +0000 (17:29 -0700)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #70656 (require() statement broken after opcache_reset() or a few hours...
Xinchen Hui [Tue, 27 Oct 2015 00:28:19 +0000 (17:28 -0700)]
Fixed bug #70656 (require() statement broken after opcache_reset() or a few hours of use)

9 years agoRevert "Fixed bug #70656 (require() statement broken after opcache_reset() or a few...
Xinchen Hui [Tue, 27 Oct 2015 00:26:30 +0000 (17:26 -0700)]
Revert "Fixed bug #70656 (require() statement broken after opcache_reset() or a few hours of use)"

This reverts commit 3ef96c2cc6f3a1dddd8479e6c733f44e8dbcb5e9.

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Tue, 27 Oct 2015 00:11:16 +0000 (17:11 -0700)]
Merge branch 'PHP-7.0'

9 years agoMerge branch 'PHP-7.0'
Leigh [Fri, 30 Oct 2015 19:11:09 +0000 (19:11 +0000)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Use arc4random on OpenBSD 5.5+ and NetBSD 7+

9 years agoUse arc4random on OpenBSD 5.5+ and NetBSD 7+
Leigh [Fri, 30 Oct 2015 19:08:20 +0000 (19:08 +0000)]
Use arc4random on OpenBSD 5.5+ and NetBSD 7+

As discussed with @weltling, keeping arc4random on the condition that the OS has a solid implementation of it

9 years agoChanged ZEND_CLONE->extended_value meaning to relative offset (previously it was...
Dmitry Stogov [Fri, 30 Oct 2015 11:53:53 +0000 (14:53 +0300)]
Changed ZEND_CLONE->extended_value meaning to relative offset (previously it was absolute opline number)

9 years agoMerge branch 'PHP-7.0'
Reeze Xia [Fri, 30 Oct 2015 11:52:03 +0000 (19:52 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  This couldn't be false as it has been checked before
  Use h parameter to avoid duplicate ht access of `array_combine()`

9 years agoThis couldn't be false as it has been checked before
Reeze Xia [Fri, 30 Oct 2015 11:50:54 +0000 (19:50 +0800)]
This couldn't be false as it has been checked before

9 years agoUse h parameter to avoid duplicate ht access of `array_combine()`
Reeze Xia [Fri, 30 Oct 2015 11:49:04 +0000 (19:49 +0800)]
Use h parameter to avoid duplicate ht access of `array_combine()`

9 years agoArgument type renaming (ADDR->JMP_ADDR, OPLINE->JMP_ABS, REL_OPLINE->JMP_REL)
Dmitry Stogov [Thu, 29 Oct 2015 19:50:45 +0000 (22:50 +0300)]
Argument type renaming (ADDR->JMP_ADDR, OPLINE->JMP_ABS, REL_OPLINE->JMP_REL)

9 years agoFixed few issues:
Dmitry Stogov [Thu, 29 Oct 2015 06:15:37 +0000 (09:15 +0300)]
Fixed few issues:

- Added ZEND_VM_LAST_OPCODE macro
- Use better names LINE->OPLINE, REL_LINE->REL_OPLINE, FCALL->FAST_CALL, FRET->FAST_RET
- Added ISSET flag to extended value of ZEND_ISSET_ISEMPTY_VAR opcode

9 years agoAdded zend_get_opcode_flags() function to get information about opcode operands and...
Dmitry Stogov [Wed, 28 Oct 2015 20:25:05 +0000 (23:25 +0300)]
Added zend_get_opcode_flags() function to get information about opcode operands and extended_value meaning

9 years agoMerge branch 'PHP-7.0'
Dmitry Stogov [Fri, 30 Oct 2015 04:16:31 +0000 (07:16 +0300)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed incomplete initialization.

9 years agoFixed incomplete initialization.
Dmitry Stogov [Fri, 30 Oct 2015 04:15:56 +0000 (07:15 +0300)]
Fixed incomplete initialization.

9 years agoMerge branch 'PHP-7.0'
Jakub Zelenka [Thu, 29 Oct 2015 19:15:57 +0000 (19:15 +0000)]
Merge branch 'PHP-7.0'

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Jakub Zelenka [Thu, 29 Oct 2015 19:14:25 +0000 (19:14 +0000)]
Merge branch 'PHP-5.6' into PHP-7.0

9 years agoMerge branch 'PHP-7.0'
Dmitry Stogov [Thu, 29 Oct 2015 17:07:37 +0000 (20:07 +0300)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed memory leak in php_stream_context_set_option()

9 years agoFixed memory leak in php_stream_context_set_option()
Dmitry Stogov [Thu, 29 Oct 2015 17:06:55 +0000 (20:06 +0300)]
Fixed memory leak in php_stream_context_set_option()

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Thu, 29 Oct 2015 07:02:00 +0000 (15:02 +0800)]
Merge branch 'PHP-7.0'

9 years agoMake these tests fail faster, Thanks to GFW
Xinchen Hui [Thu, 29 Oct 2015 07:00:43 +0000 (15:00 +0800)]
Make these tests fail faster, Thanks to GFW

9 years agoMerge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
Xinchen Hui [Thu, 29 Oct 2015 06:35:31 +0000 (14:35 +0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Thu, 29 Oct 2015 06:35:07 +0000 (14:35 +0800)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #70808 (array_merge_recursive corrupts memory of unset items)
Xinchen Hui [Thu, 29 Oct 2015 06:33:58 +0000 (14:33 +0800)]
Fixed bug #70808 (array_merge_recursive corrupts memory of unset items)

I knew, this fix seems ugly

9 years agoMerge branch 'PHP-7.0'
Dmitry Stogov [Thu, 29 Oct 2015 05:45:22 +0000 (08:45 +0300)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Don't remap .text segment if huge pages are not available.

9 years agoDon't remap .text segment if huge pages are not available.
Julien Pauli [Thu, 29 Oct 2015 05:44:19 +0000 (08:44 +0300)]
Don't remap .text segment if huge pages are not available.

9 years agoFixed incorrect instruction cleanup
Dmitry Stogov [Wed, 28 Oct 2015 20:10:33 +0000 (23:10 +0300)]
Fixed incorrect instruction cleanup

9 years agofixed incorrect bitmask
Dmitry Stogov [Wed, 28 Oct 2015 13:06:08 +0000 (16:06 +0300)]
fixed incorrect bitmask

9 years agoRemoved incorrect "return" statement
Dmitry Stogov [Wed, 28 Oct 2015 05:42:55 +0000 (08:42 +0300)]
Removed incorrect "return" statement

9 years agoSpeed up fetching of class entries for self:: parent:: and static::
Dmitry Stogov [Tue, 27 Oct 2015 12:47:58 +0000 (15:47 +0300)]
Speed up fetching of class entries for self:: parent:: and static::

This is generalized solution for Bob's idea of speed up self::method() calls without ZEND_FETCH_CLASS.

At first, it adds few new opcodes to separate class related behaviour:
FETCH_STATIC_PROP_R
FETCH_STATIC_PROP_W
FETCH_STATIC_PROP_RW
FETCH_STATIC_PROP_FUNC_ARG
FETCH_STATIC_PROP_UNSET
FETCH_STATIC_PROP_IS
UNSET_STATIC_PROP
ISSET_ISEMPTY_STATIC_PROP
FETCH_CLASS_CONSTANT

At seconds, it enables IS_UNUSED operand to fetch (self, parent or static without separate FETCH_CLASS) for new opcodes and the following ones:
INIT_STATIC_METHOD_CALL
NEW
END_INSTANCEOF

Finaly, opcache optimizer had to be fixed to support new opcodes.

9 years agoMerge branch 'PHP-7.0'
Andrey Hristov [Wed, 28 Oct 2015 11:56:26 +0000 (12:56 +0100)]
Merge branch 'PHP-7.0'

9 years agoFix mysqli tests
Andrey Hristov [Wed, 28 Oct 2015 11:55:41 +0000 (12:55 +0100)]
Fix mysqli tests

9 years agoFixed incorrect type usage
Dmitry Stogov [Wed, 28 Oct 2015 07:26:47 +0000 (10:26 +0300)]
Fixed incorrect type usage

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Tue, 27 Oct 2015 19:20:58 +0000 (20:20 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  sync NEWS
  7.0.1 is next

9 years agosync NEWS
Anatol Belski [Tue, 27 Oct 2015 19:10:06 +0000 (20:10 +0100)]
sync NEWS

9 years ago7.0.1 is next
Anatol Belski [Tue, 27 Oct 2015 19:08:54 +0000 (20:08 +0100)]
7.0.1 is next

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Tue, 27 Oct 2015 16:08:51 +0000 (17:08 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fix frequent reallocations with many small strings
  correct snprintf usage

9 years agoFix frequent reallocations with many small strings
Dmitry Stogov [Tue, 27 Oct 2015 15:53:17 +0000 (16:53 +0100)]
Fix frequent reallocations with many small strings

9 years agocorrect snprintf usage
Anatol Belski [Fri, 23 Oct 2015 10:07:16 +0000 (12:07 +0200)]
correct snprintf usage

9 years agoMerge branch 'PHP-7.0'
Andrey Hristov [Tue, 27 Oct 2015 12:33:05 +0000 (13:33 +0100)]
Merge branch 'PHP-7.0'

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Andrey Hristov [Tue, 27 Oct 2015 12:32:45 +0000 (13:32 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

9 years agoIt should not be const
Xinchen Hui [Tue, 27 Oct 2015 02:08:27 +0000 (10:08 +0800)]
It should not be const

9 years agoFixed Bug #70797 (Error while making PHP7)
Xinchen Hui [Tue, 27 Oct 2015 02:05:55 +0000 (10:05 +0800)]
Fixed Bug #70797 (Error while making PHP7)

error: ‘for’ loop initial declarations are only allowed in C99 mode

9 years agoFixed bug #70656 (require() statement broken after opcache_reset() or a few hours...
Xinchen Hui [Tue, 27 Oct 2015 00:09:42 +0000 (17:09 -0700)]
Fixed bug #70656 (require() statement broken after opcache_reset() or a few hours of use)

9 years agoMerge branch 'PHP-7.0'
Leigh [Mon, 26 Oct 2015 20:58:10 +0000 (20:58 +0000)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Remove arc4random

9 years agoRemove arc4random
Leigh [Mon, 26 Oct 2015 20:40:28 +0000 (20:40 +0000)]
Remove arc4random

There has been a lot of discussion around whether arc4random should be included. Given how many different impementations of it are in the wild, we can't guarantee a secure implementation on all platforms.

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Mon, 26 Oct 2015 14:57:46 +0000 (15:57 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  update NEWS
  Fixed bug #70718 stream_select() when OpenSSL extension is loaded on PHP Win64
  unbreak coverage data: fix #line directives in phpdbg parser
  exclude datelib from coverage report as asked by Derick

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Mon, 26 Oct 2015 14:57:26 +0000 (15:57 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  update NEWS
  Fixed bug #70718 stream_select() when OpenSSL extension is loaded on PHP Win64
  unbreak coverage data: fix #line directives in phpdbg parser
  exclude datelib from coverage report as asked by Derick

9 years agoupdate NEWS
Anatol Belski [Mon, 26 Oct 2015 14:56:34 +0000 (15:56 +0100)]
update NEWS

9 years agoFixed bug #70718 stream_select() when OpenSSL extension is loaded on PHP Win64
Anatol Belski [Mon, 26 Oct 2015 14:54:29 +0000 (15:54 +0100)]
Fixed bug #70718 stream_select() when OpenSSL extension is loaded on PHP Win64

9 years agoMerge branch 'PHP-7.0'
Dmitry Stogov [Mon, 26 Oct 2015 13:03:35 +0000 (16:03 +0300)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed inconsistent exception handling (uopz/tests/006.phpt was failed when PHP build with --disable-gcc-global-regs).

9 years agoFixed inconsistent exception handling (uopz/tests/006.phpt was failed when PHP build...
Dmitry Stogov [Mon, 26 Oct 2015 13:01:20 +0000 (16:01 +0300)]
Fixed inconsistent exception handling (uopz/tests/006.phpt was failed when PHP build with --disable-gcc-global-regs).

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Mon, 26 Oct 2015 03:15:53 +0000 (11:15 +0800)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #70785 (Infinite loop due to exception during identical comparison)
Xinchen Hui [Mon, 26 Oct 2015 03:15:17 +0000 (11:15 +0800)]
Fixed bug #70785 (Infinite loop due to exception during identical comparison)

9 years agoMerge branch 'PHP-7.0'
Jakub Zelenka [Sun, 25 Oct 2015 17:57:15 +0000 (17:57 +0000)]
Merge branch 'PHP-7.0'

9 years agoCheck EVP_SealFinal return code
Jakub Zelenka [Sun, 25 Oct 2015 17:53:39 +0000 (17:53 +0000)]
Check EVP_SealFinal return code

This can be done since we no longer support OpenSSL 0.9.6

9 years agoMerge branch 'PHP-7.0'
Bob Weinand [Sun, 25 Oct 2015 17:48:18 +0000 (18:48 +0100)]
Merge branch 'PHP-7.0'

9 years agoFix refcount reaching 2^32 - 1 for resources
Bob Weinand [Sun, 25 Oct 2015 17:47:50 +0000 (18:47 +0100)]
Fix refcount reaching 2^32 - 1 for resources
Happens e.g. in proc_close() when nothing is referencing the file handles, e.g. they have refcount 0 when passed to zend_list_close() and then zend_list_delete() which decrements it to (uint32_t) -1

9 years agounbreak coverage data: fix #line directives in phpdbg parser
Nuno Lopes [Sat, 24 Oct 2015 22:12:24 +0000 (18:12 -0400)]
unbreak coverage data: fix #line directives in phpdbg parser

9 years agounbreak coverage data: fix #line directives in phpdbg parser
Nuno Lopes [Sat, 24 Oct 2015 21:45:53 +0000 (17:45 -0400)]
unbreak coverage data: fix #line directives in phpdbg parser

9 years agounbreak coverage data: fix #line directives in phpdbg parser
Nuno Lopes [Sat, 24 Oct 2015 21:45:31 +0000 (17:45 -0400)]
unbreak coverage data: fix #line directives in phpdbg parser

9 years agoexclude datelib from coverage report as asked by Derick
Nuno Lopes [Sat, 24 Oct 2015 21:38:20 +0000 (17:38 -0400)]
exclude datelib from coverage report as asked by Derick

9 years agoexclude datelib from coverage report as asked by Derick
Nuno Lopes [Sat, 24 Oct 2015 21:37:00 +0000 (17:37 -0400)]
exclude datelib from coverage report as asked by Derick

9 years agoexclude datelib from coverage report as asked by Derick
Nuno Lopes [Sat, 24 Oct 2015 21:36:23 +0000 (17:36 -0400)]
exclude datelib from coverage report as asked by Derick

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Sat, 24 Oct 2015 21:19:36 +0000 (23:19 +0200)]
Merge branch 'PHP-7.0'

9 years agoFix bug #70782
Nikita Popov [Sat, 24 Oct 2015 21:18:28 +0000 (23:18 +0200)]
Fix bug #70782

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Fri, 23 Oct 2015 11:59:41 +0000 (13:59 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fix globals initialization in sapi/cgi

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Fri, 23 Oct 2015 11:59:27 +0000 (13:59 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix globals initialization in sapi/cgi

9 years agoFix globals initialization in sapi/cgi
Anatol Belski [Fri, 23 Oct 2015 11:56:40 +0000 (13:56 +0200)]
Fix globals initialization in sapi/cgi

Basically backport 8430ec17

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Fri, 23 Oct 2015 08:16:51 +0000 (10:16 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  rather use the supplied inttypes.h with vc14
  fix test redirection when run not from source root

9 years agorather use the supplied inttypes.h with vc14
Anatol Belski [Fri, 23 Oct 2015 07:47:00 +0000 (09:47 +0200)]
rather use the supplied inttypes.h with vc14

9 years agofix test redirection when run not from source root
Anatol Belski [Tue, 20 Oct 2015 09:44:12 +0000 (11:44 +0200)]
fix test redirection when run not from source root

9 years agoMerge branch 'fix-folding-marker' of https://github.com/ngsw/php-src
Xinchen Hui [Fri, 23 Oct 2015 03:28:22 +0000 (11:28 +0800)]
Merge branch 'fix-folding-marker' of https://github.com/ngsw/php-src

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Fri, 23 Oct 2015 03:19:37 +0000 (11:19 +0800)]
Merge branch 'PHP-7.0'

9 years agoIndents
Xinchen Hui [Fri, 23 Oct 2015 03:18:30 +0000 (11:18 +0800)]
Indents

9 years agoFix boolean conversion warnings
c9s [Thu, 22 Oct 2015 12:59:42 +0000 (20:59 +0800)]
Fix boolean conversion warnings

Summary:

The compiler complains and raised some warnings about boolean
conversion:

    warning: address of 'ce->constants_table' will always evaluate to
    'true' [-Wpointer-bool-conversion]

Since the address of 'HashTable' will always evaluate to true. the
condition should be removed. The scope is kept for local variables.

Platform:

    OS X 10.11

Compiler:

    Apple LLVM version 7.0.0 (clang-700.0.72)
    Target: x86_64-apple-darwin15.0.0
    Thread model: posix

9 years agoIndents
Xinchen Hui [Fri, 23 Oct 2015 03:18:30 +0000 (11:18 +0800)]
Indents