archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
88979 commits 526 branches 1434 tags 878 MiB
Commit graph

88979 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anatol Belski
a44ed26dcf Merge remote-tracking branch 'weltling/libmagic_upgrade' 
* weltling/libmagic_upgrade: (29 commits)
  partially revert wrong merge
  after merge fix
  updated libmagic.patch
  catching up
  catching up
  regenerated data file
  more after patch fixes
  restore good patch parts
  stat is done by php
  use zend_strndup
  started to patch for libmagic.next
  fix test outputs
  catch up with the previous cve-2014-3538 patch
  catching up
  catching up
  catching up
  updated the test magic file
  add patchlevel info
  portable off_t
  regenerated data file
  ...
 2015-03-08 20:31:02 +01:00
Jeff Welch
1dc5bd47d8 Adjust logic in sanity checks. 
The code should return false when the provided options argument is neither an
array nor a valid filter.
 2015-03-08 15:27:41 -04:00
Anatol Belski
d5558138d7 partially revert wrong merge 2015-03-08 20:05:34 +01:00
Anatol Belski
bae44417a8 after merge fix 2015-03-08 19:56:31 +01:00
Anatol Belski
12babf59c1 updated libmagic.patch 2015-03-08 19:48:05 +01:00
Anatol Belski
316b1e0267 catching up 2015-03-08 19:48:01 +01:00
Anatol Belski
3e8a5485e2 catching up 2015-03-08 19:47:59 +01:00
Anatol Belski
eeb74b0ab8 regenerated data file 2015-03-08 19:47:53 +01:00
Anatol Belski
f54cf1ec57 more after patch fixes 2015-03-08 19:47:50 +01:00
Anatol Belski
1ebe527757 restore good patch parts 2015-03-08 19:47:48 +01:00
Anatol Belski
75a1392fb5 stat is done by php 2015-03-08 19:47:42 +01:00
Anatol Belski
49dc53722b use zend_strndup 2015-03-08 19:47:41 +01:00
Anatol Belski
1b77e51ad7 started to patch for libmagic.next 
everything is broken yet
 2015-03-08 19:47:38 +01:00
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