Tom Van Looy
04fb3f28ff
Remove superfluous semicolons
2017-06-26 00:23:25 +02:00
Dmitry Stogov
db4561bfff
Introduced "zif_handler" type (zif = zend internal function).
2017-06-08 16:52:39 +03:00
Sara Golemon
a86c87df2d
Escape value passed to exec()
...
getmypid() is safe, but no harm being EXTRA safe.
2017-06-01 15:43:25 -07:00
Sara Golemon
a9294d36bc
Ignore spurious stderr output from lsof
...
lsof may report errors trying to stat files owned by other
users in other processes, even when asking for files
associated to a specific process. Boo.
2017-06-01 15:43:25 -07:00
Joe Watkins
2a64f548da
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fix Bug #74386Phar::__construct(): wrong number of parameters by reflection
2017-05-29 08:32:23 +01:00
Fabien Villepinte
d6922ef8e3
Fix Bug #74386Phar::__construct(): wrong number of parameters by reflection
2017-05-29 08:31:47 +01:00
Dmitry Stogov
27e7aea412
"Countable" interface is moved from SPL to Core
2017-05-25 12:47:43 +03:00
Anatol Belski
627f870161
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed bug #51918 Phar::webPhar() does not handle requests sent through PUT and DELETE method
2017-05-02 14:47:08 +02:00
Anatol Belski
64adba3b3f
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #51918 Phar::webPhar() does not handle requests sent through PUT and DELETE method
2017-05-02 14:46:15 +02:00
Christian Weiske
c0c0871911
Fixed bug #51918 Phar::webPhar() does not handle requests sent through PUT and DELETE method
...
phar: Support DELETE, HEAD and PUT HTTP methods in Phar::webPhar
Up to now only GET and POST requests could be handled with Phar::webPhar(),
which is insufficient for today's REST APIs.
This patch expands the list of supported HTTP methods.
2017-05-02 14:44:47 +02:00
Mitch Hagstrand
a9fdf3d6b4
Fix for Bug 74196: PharData->decompress() does not correctly support dot names
...
1. Fixed phar_rename_archive to no longer remove everything after a "." in the filename
2. Removed unused "zend_bool compress" parameter
3. Added Test
4. Fixed tests that had a work around for this problem
2017-04-10 06:43:26 +01:00
Joe Watkins
b0f9dba2d9
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fix of Bug #74383 : Wrong reflection on Phar::running
2017-04-10 06:33:42 +01:00
Joe Watkins
9fe4d2d9cb
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix of Bug #74383 : Wrong reflection on Phar::running
2017-04-10 06:32:40 +01:00
Mitch Hagstrand
d9a05807d2
Fix of Bug #74383 : Wrong reflection on Phar::running
2017-04-10 06:32:15 +01:00
Mitch Hagstrand
775afd5e2d
Fix of Bug #74383 : Wrong reflection on Phar::running
2017-04-10 06:24:57 +01:00
Jakub Zelenka
cdc33251d2
Add OpenSSL 1.1.0 support to PHP 7.0
2017-04-07 19:21:33 +01:00
Nikita Popov
162aa1a5fc
Deprecate __autoload()
2017-02-03 18:52:57 +01:00
Anatol Belski
6eaa55db79
Merge branch 'PHP-7.1'
...
* PHP-7.1:
fix remaining tests for Opcache runs
2017-01-13 17:23:05 +01:00
Anatol Belski
929819aaac
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix remaining tests for Opcache runs
2017-01-13 17:21:01 +01:00
Anatol Belski
aaaef22db6
fix remaining tests for Opcache runs
...
The fail reason here is the TMP change while both top and test
run same binary with opcache enabled.
2017-01-13 17:16:15 +01:00
Christoph M. Becker
583950336a
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fix #70417 : PharData::compress() doesn't close temp file
2017-01-05 18:52:03 +01:00
Christoph M. Becker
e7ce861def
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix #70417 : PharData::compress() doesn't close temp file
2017-01-05 18:51:04 +01:00
Christoph M. Becker
995ecffbb2
Fix #70417 : PharData::compress() doesn't close temp file
...
According to the comment, it has not been deemed necessary to close compressed
files. However, we don't want to keep unclosed file handles to save ressources.
So we're also closing compressed archives, if they're not aliased.
2017-01-05 14:12:31 +01:00
Sammy Kaye Powers
dac6c639bb
Update copyright headers to 2017
2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
478f119ab9
Update copyright headers to 2017
2017-01-04 11:14:55 -06:00
Sammy Kaye Powers
1e3624290a
Resolve conflict
2017-01-03 08:01:05 -06:00
Stanislav Malyshev
0de25147d3
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fix bug #73737 FPE when parsing a tag format
Fix bug #73773 - Seg fault when loading hostile phar
Fix bug #73825 - Heap out of bounds read on unserialize in finish_nested_data()
Fix bug #73768 - Memory corruption when loading hostile phar
Fix int overflows in phar (bug #73764 )
2017-01-02 21:26:20 -08:00
Stanislav Malyshev
2075fb2b73
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix bug #73737 FPE when parsing a tag format
Fix bug #73773 - Seg fault when loading hostile phar
Fix bug #73825 - Heap out of bounds read on unserialize in finish_nested_data()
Fix bug #73768 - Memory corruption when loading hostile phar
Fix int overflows in phar (bug #73764 )
2017-01-02 21:07:01 -08:00
Stanislav Malyshev
7f0de1a138
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix bug #73737 FPE when parsing a tag format
Fix bug #73773 - Seg fault when loading hostile phar
Fix bug #73825 - Heap out of bounds read on unserialize in finish_nested_data()
Fix bug #73768 - Memory corruption when loading hostile phar
Fix int overflows in phar (bug #73764 )
2017-01-02 21:01:35 -08:00
Sammy Kaye Powers
9e29f841ce
Update copyright headers to 2017
2017-01-02 09:30:12 -06:00
Stanislav Malyshev
e5246580a8
Fix bug #73773 - Seg fault when loading hostile phar
2016-12-31 18:47:50 -08:00
Stanislav Malyshev
b28b8b2fee
Fix bug #73768 - Memory corruption when loading hostile phar
2016-12-30 15:57:24 -08:00
Stanislav Malyshev
ca46d0acbc
Fix int overflows in phar (bug #73764 )
2016-12-30 15:39:48 -08:00
Anatol Belski
758af77e9d
Path handling related refactorings
...
Primarily related to the path handling datatypes, to avoid unnecessary
casts, where possible. Also some rework to avoid code dup. Probably
more places are to go, even not path related, primarily to have less
casts and unsigned integers where possible. That way, we've not only
less warnings and casts, but are also safer with regard to the
integer overflows. OFC it's not a panacea, but still significantly
reduces the vulnerability potential.
2016-12-22 14:56:47 +01:00
Sara Golemon
5004ae2b62
Silence warning from unhandled enum
...
(cherry picked from commit 57bbe2c140
)
2016-12-17 00:12:33 +01:00
Anatol Belski
2f9e928af8
fix leaking streams and memory mapped files
...
(cherry picked from commit f1ff23095b
)
2016-12-17 00:12:19 +01:00
Sara Golemon
587f1b2427
Silence warning from unhandled enum
...
(cherry picked from commit 57bbe2c140
)
2016-12-16 22:55:13 +01:00
Anatol Belski
9cdf64c225
fix leaking streams and memory mapped files
...
(cherry picked from commit f1ff23095b
)
2016-12-16 22:55:02 +01:00
Sara Golemon
57bbe2c140
Silence warning from unhandled enum
2016-12-12 23:25:57 -08:00
Anatol Belski
f1ff23095b
fix leaking streams and memory mapped files
2016-12-11 02:52:02 +01:00
Anatol Belski
b204b3abd1
further normalizations, uint vs uint32_t
...
fix merge mistake
yet one more replacement run
2016-11-26 17:29:01 +01:00
Stanislav Malyshev
b1ff0c5270
Fix more size_t/int implicit conversions
...
Now the conversions are explicit and do checks. Not sure it's
the best way but at least we can see them now in the open.
2016-11-25 18:58:06 -08:00
Stanislav Malyshev
fe994fd9a4
Fix int/size_t confusion in isValidPharFilename (bug #73580 )
2016-11-25 18:57:18 -08:00
Stanislav Malyshev
f9a80a0a29
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix more size_t/int implicit conversions
2016-11-25 15:32:59 -08:00
Stanislav Malyshev
8be94d46f8
Fix more size_t/int implicit conversions
...
Now the conversions are explicit and do checks. Not sure it's
the best way but at least we can see them now in the open.
2016-11-25 15:31:50 -08:00
Stanislav Malyshev
bcc913fa8b
Fix int/size_t confusion in isValidPharFilename (bug #73580 )
2016-11-25 15:31:50 -08:00
Stanislav Malyshev
7010547c4e
Fix more size_t/int implicit conversions
...
Now the conversions are explicit and do checks. Not sure it's
the best way but at least we can see them now in the open.
2016-11-25 15:30:20 -08:00
Stanislav Malyshev
2cc3df3252
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix int/size_t confusion in isValidPharFilename (bug #73580 )
2016-11-25 13:43:59 -08:00
Stanislav Malyshev
cb6bcaa61f
Fix int/size_t confusion in isValidPharFilename (bug #73580 )
2016-11-25 13:42:35 -08:00
Nikita Popov
5af586bec5
Remove more PHP 6 leftovers from tests
2016-11-24 22:39:39 +01:00