Julien Pauli
2f06413340
Fix #67626
2015-03-08 23:45:11 -07:00
Julien Pauli
37ecfdad09
Fix #63486
2015-03-08 23:41:46 -07:00
Xinchen Hui
c7de82b0d9
Add note of group use
2015-03-09 12:08:34 +08:00
Xinchen Hui
7bf082d638
Merge branch 'filter/adjust-logic' of https://github.com/whatthejeff/php-src
2015-03-09 11:43:10 +08:00
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
33ef5c47a5
Merge branch 'pull-request/1135'
...
* pull-request/1135:
Return void like other functions
Use zend_parse_parameters_none()
Implemented FR #45235 A way to clear or reset the results for error_get_last()
2015-03-08 17:26:38 -07:00
Stanislav Malyshev
a8a77fff5c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Regression tests for SplFileInfo class setters
2015-03-08 17:13:32 -07:00
Stanislav Malyshev
dcc031470a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Regression tests for SplFileInfo class setters
2015-03-08 17:13:25 -07:00
Stanislav Malyshev
a2a20d29a8
Merge branch 'pull-request/1134' into PHP-5.5
...
* pull-request/1134:
Regression tests for SplFileInfo class setters
2015-03-08 17:13:02 -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
876a9be3ee
Merge branch 'pull-request/1129'
...
* pull-request/1129:
Array - make krsort FAST_ZPP compatibility
2015-03-08 17:04:13 -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
Stanislav Malyshev
1446bf5ebf
Adding notes regarding implementation of FR #69089
2015-03-08 16:51:00 -07:00
Stanislav Malyshev
fdc46d790b
Merge branch 'pull-request/1070'
...
* pull-request/1070:
More docs for /win32/build/confutils.js
Adding some inline docs/docs cleanup
2015-03-08 16:46:15 -07:00
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
