Anatol Belski
332bbfa23b
fix test outputs
2015-03-08 19:47:34 +01:00
Anatol Belski
9603f16f99
catch up with the previous cve-2014-3538 patch
2015-03-08 19:47:33 +01:00
Anatol Belski
f39a8517e0
catching up
2015-03-08 19:47:31 +01:00
Anatol Belski
5892ec175a
catching up
2015-03-08 19:47:30 +01:00
Anatol Belski
ca98547801
catching up
2015-03-08 19:47:28 +01:00
Anatol Belski
ef51790f61
updated the test magic file
2015-03-08 19:47:27 +01:00
Anatol Belski
7022fe80f7
add patchlevel info
2015-03-08 19:47:25 +01:00
Anatol Belski
ec84d36c9f
portable off_t
2015-03-08 19:47:24 +01:00
Anatol Belski
969ce2e877
regenerated data file
2015-03-08 19:47:21 +01:00
Anatol Belski
0d410fc2d2
more after patch fixes
2015-03-08 19:47:20 +01:00
Anatol Belski
1a7798c786
restore good patch parts
2015-03-08 19:47:18 +01:00
Anatol Belski
9e3be05e32
missing prototype
2015-03-08 19:47:17 +01:00
Anatol Belski
9b1bdccb04
libmagic.patch so far
2015-03-08 19:47:15 +01:00
Anatol Belski
0dd82374d1
updated test magic file
2015-03-08 19:47:14 +01:00
Anatol Belski
2fd282a690
use right memory api
2015-03-08 19:47:12 +01:00
Anatol Belski
f3fad68efd
stat is done by php
2015-03-08 19:47:11 +01:00
Anatol Belski
a1883a8523
use zend_strndup
2015-03-08 19:47:09 +01:00
Anatol Belski
2181ed2e2a
started to patch for libmagic.next
...
everything is broken yet
2015-03-08 19:47:06 +01: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
xingxing
1b0d32b350
Add configtest option to fpm init.d script
2015-03-08 22:48:29 +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
Reeze Xia
609f05fc19
ZTS cleanup
2015-03-08 19:25:55 +08:00
Jakub Zelenka
0cb869d908
Merge branch 'pull-request/1151'
2015-03-08 10:47:22 +00:00
Remi Collet
02808aeca3
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix odbc build as shared
2015-03-08 07:37:07 +01:00
Remi Collet
43da0d302b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix odbc build as shared
2015-03-08 07:36:35 +01:00
Remi Collet
89f86119d6
Fix odbc build as shared
...
Broken since a41aa46759
2015-03-08 07:34:51 +01: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
Dmitry Stogov
0b7896cca5
Restored incorrectly merged NEWS
2015-03-07 15:07:48 +03:00
Hugo Fonseca
baece85399
Added test for bug 69187
2015-03-07 10:53:31 +00:00
Xinchen Hui
28b408a242
Fixed bug #69198 (Compact function generate array with length but no content)
2015-03-07 16:49:07 +08:00
Anatol Belski
f1d1273f2b
fix fetching wrong resource
2015-03-06 21:02:29 +01:00
Jakub Zelenka
9d037d574c
Update UPGRADING with info about JSON decode error for empty string
2015-03-06 18:41:43 +00:00
