clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 23:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
88,609 Commits 494 Branches 1,367 Tags 802 MiB
22a61cea33
Commit Graph

10042 Commits

Author SHA1 Message Date
Xinchen Hui
96f7a33df6 Temorary fix for phpdbg segfault while use zend_mm_set_custom_handlers 2015-03-09 11:19:05 +08:00
Stanislav Malyshev
69d183dd19 Merge branch 'pull-request/1049' 
* pull-request/1049:
  Rename __callstatic (internal name) to __callStatic (userland name) in error message
 2015-03-08 17:57:47 -07:00
Stanislav Malyshev
6adac79a73 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Add missing value for error_reporting directive
 2015-03-08 17:05:59 -07:00
Stanislav Malyshev
b0d1e23646 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add missing value for error_reporting directive
 2015-03-08 17:05:51 -07:00
Stanislav Malyshev
d7931f8f66 Merge branch 'pull-request/1130' into PHP-5.5 
* pull-request/1130:
  Add missing value for error_reporting directive
 2015-03-08 17:05:37 -07:00
Stanislav Malyshev
90b8898d22 Merge branch 'pull-request/1127' 
* pull-request/1127:
  merge ZEND_SIGNED_MULTIPLY_LONG for i386 and x86_64
 2015-03-08 17:02:48 -07:00
Xinchen Hui
4861e1bd6b Revert "Fixed memleak while using custom mm" 
This reverts commit 5eabd979ff.
 2015-03-09 00:41:19 +08:00
Xinchen Hui
5eabd979ff Fixed memleak while using custom mm 2015-03-09 00:18:54 +08:00
Xinchen Hui
51b96086d7 Revert "Fixed memleak in alloc_globals_ctor" 
This reverts commit 85316b4bf0.
 2015-03-09 00:17:52 +08:00
Xinchen Hui
1638db71fd Declares in top 2015-03-09 00:01:55 +08:00
Xinchen Hui
caa306f6e3 Merge branch 'batch-use' of https://github.com/marcioAlmada/php-src 2015-03-08 23:54:46 +08:00
Márcio Almada
22d6cc7c8c fix compilation warnings, rename batch_use to group_use 2015-03-08 12:50:57 -03:00
Rouven Weßling
bb0504534d Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable 2015-03-08 23:00:13 +08:00
Xinchen Hui
5aebdc98de Fixed bug #69201 (Memory leak using iterator and get by reference on PHP 7) 2015-03-08 20:22:02 +08:00
Márcio Almada
072d1dad15 add explicit tests for variations on whitespace usages 2015-03-07 17:59:48 -03:00
Márcio Almada
344fc25b12 require trailing T_NS_SEPARATOR #1005 2015-03-07 17:59:48 -03:00
Márcio Almada
52b20b0b46 fix test ns_092.phpt 2015-03-07 17:59:48 -03:00
Márcio Almada
fbde890ee2 allow non mixed use declarations, CC @nikic #1005 
```
use function N\S { foo, bar, etc };
use const N\S { FOO, BAR, ETC };
```

Related tests:

```
make test -j4 TESTS="-m Zend/tests/ns_0{88..92}*.phpt"
```

All namespace tests:

```
make test -j4 TESTS="Zend/tests/ns_*.phpt"
```
 2015-03-07 17:59:48 -03:00
Márcio Almada
e9f82abd61 add test for non mixed batch use statements... #1005 
```
use function foo\math {sin, cos, sum};
use const foo\math { PI, E, GAMMA, GOLDEN_RATIO }
```
 2015-03-07 17:59:48 -03:00
Márcio Almada
4485056a31 ensure that comments are allowed between batch use declarations #1005 2015-03-07 17:59:48 -03:00
Márcio Almada
95abd5c5a4 simplify batch use declaration syntax error test: ns_088.phpt 2015-03-07 17:59:48 -03:00
Márcio Almada
275e7276c1 first implementation of batch use compilation 2015-03-07 17:59:48 -03:00
Márcio Almada
bb171e2edc add tests for batch use declarations with classes, functions and constants 2015-03-07 17:59:48 -03:00
Márcio Almada
39b0e2c90d fix typo 2015-03-07 17:59:48 -03:00
Bob Weinand
b1cd381f01 Added test for bug #69160 (current behavior is correct) 2015-03-07 20:59:42 +01:00
Xinchen Hui
95b4aa5293 Fixed zend_hash_append result duplicated key 
actually, maybe we should precalculate before calling zend_hash_appen
when we are not sure whether the hash is caclculated(prop_info->name).

but it looks a little ugly.. (also for zend_string_copy)
 2015-03-08 00:21:02 +08:00
Bob Weinand
afad979c60 Reduced initial VM_STACK page size of Generators to 4 KB (256 slots) 
Generators all have their own vm_stack, but usually don't go really deep.
In most cases even most of the 4 KB will remain unused (in my tests average is rather 1 KB), but this was tested a straightforward implementation without a lot of abstraction layers.
That way I'm using a more conservative 4 KB stack size which really should be enough for, I think, at least 90% of the cases.
This was necessary to not immediately run out of memory with 95%+ usused vm_stack space: If you have a few thousands of Generators active, your application quickly hits memory_limit with a stack page size of 256 KB...
In addition, it's also a bit faster (70% less instructions for zend_vm_stack_new_page) due to emalloc() not having to allocate a whole new segment (segment size 256 KB). Also no mmap()/malloc() necessary.
 2015-03-07 13:25:21 +01:00
Xinchen Hui
28b408a242 Fixed bug #69198 (Compact function generate array with length but no content) 2015-03-07 16:49:07 +08:00
Dmitry Stogov
9f9ffdd0a0 Use fast zend_hash_append() API 2015-03-06 19:23:54 +03:00
Dmitry Stogov
66f5a1e8b4 Make fast path linear 2015-03-06 17:07:36 +03:00
Dmitry Stogov
a3674a5dcb Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Unused var
 2015-03-05 18:19:27 +03:00
Dmitry Stogov
6d065a8545 Avoid repeatable strlen() calls 2015-03-05 18:18:39 +03:00
Xinchen Hui
1ebdbdfd78 Unused var 2015-03-05 23:09:58 +08:00
Dmitry Stogov
bb91bf83f9 Minimize copying of HashTable realocation 2015-03-05 17:22:10 +03:00
Xinchen Hui
eadff75c7d Merge branch 'PHP-5.6' 2015-03-05 21:10:02 +08:00
Xinchen Hui
e8e5913e5e Merge branch 'PHP-5.5' into PHP-5.6 2015-03-05 21:06:07 +08:00
Xinchen Hui
869f8bd24b Error also maybe happened here 2015-03-05 21:05:26 +08:00
Xinchen Hui
7bcdbcf98e Revert commit to zend signal by mistake 2015-03-05 19:04:43 +08:00
Xinchen Hui
2f88a2d520 Merge branch 'cleanup' of https://github.com/zxcvdavid/php-src 2015-03-05 18:45:00 +08:00
Xinchen Hui
f2c8b611cf Merge branch 'PHP-5.6' 2015-03-05 18:44:13 +08:00
Xinchen Hui
168be6f250 Merge branch 'PHP-5.5' into PHP-5.6 2015-03-05 18:40:06 +08:00
Xinchen Hui
f039225597 Fixed bug #69174 (leaks when unused inner class use traits precedence) 2015-03-05 18:39:50 +08:00
Xinchen Hui
fd5a756ad4 Revive Zend Signals handler (and fixed bug #61083) 2015-03-05 18:11:22 +08:00
Wei Dai
488688cfc7 Remove the unused vars 2015-03-05 15:55:30 +08:00
Dmitry Stogov
6dfff52f61 Improved method inhereitance code and cleanup 2015-03-05 02:10:38 +03:00
Dmitry Stogov
c9bd24de7a Improved ineritance code 2015-03-04 23:06:07 +03:00
Dmitry Stogov
ff039c3c6d Merge commit 'refs/pull/1066/head' of git://github.com/php/php-src 
* git://github.com/php/php-src:
  Add zend assert deleted by accident
  Let's keep it simple
  Improve internal function return types checking for parent
 2015-03-04 18:17:06 +03:00
Dmitry Stogov
13eed2676d Merge commit 'refs/pull/1137/head' of git://github.com/php/php-src 
* git://github.com/php/php-src:
  Optimize class constant declare compilation
 2015-03-04 18:07:07 +03:00
Dmitry Stogov
68d4575132 Merge branch 'pull-request/1128' 
* pull-request/1128:
  Fixed memleak in alloc_globals_ctor
 2015-03-04 17:55:02 +03:00
Dmitry Stogov
8ec8648c91 Improved code for class property inheritance 2015-03-04 17:41:01 +03:00