Dmitry Stogov
9bdbc7490f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #69152
2015-03-19 11:42:49 +03:00
Dmitry Stogov
51856a76f8
Fixed bug #69152
2015-03-19 11:36:01 +03:00
Anthony Ferrara
1df033c5cd
Revert gd and mysqli to former calls for arg count errors. Fix first identified issues with zend_compile.c from nikic. Add tests for generator returns prior to first yield
2015-03-18 16:14:02 -04:00
Anthony Ferrara
d22bfb8aa6
Merge in master, fix merge conflicts and update patch to support exceptions everywhere
2015-03-18 10:50:11 -04:00
Dmitry Stogov
d092cb6e8e
Second prefetch is useless, because cahce line on modern x86 CPUs is 64 bytes long.
2015-03-18 17:11:21 +03:00
Stanislav Malyshev
1ecd82f588
Merge branch 'PHP-5.6'
...
* PHP-5.6:
update NEWS
Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary
oops, no idea how this got in
Fix bug #69248 - heap overflow vulnerability in regcomp.c
add test for bug #68976
add NEWS
Fixed bug #68976 - Use After Free Vulnerability in unserialize()
update news
Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)
fix tests
Fix bug #69207 - move_uploaded_file allows nulls in path
Conflicts:
ext/ereg/regex/regcomp.c
ext/standard/basic_functions.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
win32/registry.c
2015-03-17 22:04:39 -07:00
Stanislav Malyshev
225cb973e5
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS
Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary
Conflicts:
ext/zip/lib/zip_dirent.c
2015-03-17 22:03:24 -07:00
Stanislav Malyshev
53eff4a369
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary
2015-03-17 22:00:29 -07:00
Stanislav Malyshev
ef8fc4b53d
Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary
2015-03-17 21:59:56 -07:00
Xinchen Hui
205fe3ab89
Re-fix tests
2015-03-18 12:28:27 +08:00
Xinchen Hui
22b8b1d3f3
Revert "fix tests"
...
This reverts commit 38e15d89d7
.
2015-03-18 12:27:13 +08:00
Xinchen Hui
e78278d878
Revert "Fixed tests"
...
This reverts commit f57f1a903d
.
2015-03-18 12:26:56 +08:00
Xinchen Hui
f57f1a903d
Fixed tests
2015-03-18 12:19:56 +08:00
Stanislav Malyshev
d76b293ac7
forgot to commit this one
2015-03-17 17:16:27 -07:00
Stanislav Malyshev
63c9f830b1
add test for bug #68976
2015-03-17 17:16:15 -07:00
Stanislav Malyshev
bf2f03ddb3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #69248 - heap overflow vulnerability in regcomp.c
add test for bug #68976
2015-03-17 17:10:05 -07:00
Stanislav Malyshev
890b3987ab
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #69248 - heap overflow vulnerability in regcomp.c
add test for bug #68976
2015-03-17 17:09:47 -07:00
Stanislav Malyshev
c83dd84ad6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #69248 - heap overflow vulnerability in regcomp.c
add test for bug #68976
2015-03-17 17:08:13 -07:00
Stanislav Malyshev
fb04dcf6db
Fix bug #69248 - heap overflow vulnerability in regcomp.c
...
Merged from 70bc296560
2015-03-17 17:04:57 -07:00
Stanislav Malyshev
8b14d3052f
add test for bug #68976
2015-03-17 17:03:46 -07:00
Stanislav Malyshev
780222f97f
Fixed bug #68976 - Use After Free Vulnerability in unserialize()
2015-03-17 16:31:52 -07:00
Stanislav Malyshev
38e15d89d7
fix tests
2015-03-17 16:30:57 -07:00
Stanislav Malyshev
6632684e03
Fix bug #69207 - move_uploaded_file allows nulls in path
2015-03-17 16:30:57 -07:00
Stanislav Malyshev
33a5532b66
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68976 - Use After Free Vulnerability in unserialize()
Conflicts:
ext/standard/var_unserializer.c
2015-03-17 13:23:51 -07:00
Stanislav Malyshev
d5e523f52f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #68976 - Use After Free Vulnerability in unserialize()
Conflicts:
ext/standard/var_unserializer.c
2015-03-17 13:22:12 -07:00
Stanislav Malyshev
646572d6d3
Fixed bug #68976 - Use After Free Vulnerability in unserialize()
2015-03-17 13:20:22 -07:00
Stanislav Malyshev
3477568b4e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix tests
Fix bug #69207 - move_uploaded_file allows nulls in path
2015-03-17 12:58:00 -07:00
Stanislav Malyshev
9ba4db5e5d
fix tests
2015-03-17 12:55:35 -07:00
Stanislav Malyshev
e55e40ca66
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #69207 - move_uploaded_file allows nulls in path
2015-03-17 12:48:37 -07:00
Stanislav Malyshev
1291d6bbee
Fix bug #69207 - move_uploaded_file allows nulls in path
2015-03-17 12:47:58 -07:00
julien.pons
90114a3e93
Add wifcontinued and wcontinued for pcntl
2015-03-17 10:59:58 +01:00
Julien Pauli
4d3a3811a9
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix flaws in session module
Conflicts:
ext/session/session.c
2015-03-16 16:11:02 +01:00
Julien Pauli
2a50877428
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix flaws in session module
2015-03-16 16:01:12 +01:00
Julien Pauli
4dba99c226
Fix flaws in session module
2015-03-16 16:00:46 +01:00
Dmitry Stogov
0a6ab089cd
Use memcmp() instead of strncmp()
2015-03-16 15:53:54 +03:00
Anatol Belski
293d6e629d
backport af2b0669
into 5.5
2015-03-16 08:32:39 +01:00
Anatol Belski
8f0dbe2355
Merge branch 'PHP-5.6'
...
* PHP-5.6:
libxml-2.9.2 compatibility
2015-03-15 18:39:38 +01:00
Anatol Belski
af2b066911
libxml-2.9.2 compatibility
2015-03-15 18:38:50 +01:00
Anatol Belski
bbc183d88a
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix test
2015-03-14 18:31:02 +01:00
Anatol Belski
2ac31872ac
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test
2015-03-14 18:30:32 +01:00
Anatol Belski
c21c8f369d
fix test
2015-03-14 18:29:59 +01:00
Nikita Popov
547d387973
Merge branch 'PHP-5.6'
2015-03-14 09:18:50 +01:00
Nikita Popov
846c8059e6
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-14 09:18:31 +01:00
Jeff Welch
1e51c5411e
Fix #69203 : FILTER_FLAG_STRIP_HIGH doesn't strip ASCII 127
2015-03-14 09:17:36 +01:00
Reeze Xia
7409fd4bf7
Fix folder mark
2015-03-14 14:06:57 +08:00
Xinchen Hui
9420a2a5b0
Merge branch 'PHP-5.6'
2015-03-14 11:32:09 +08:00
Xinchen Hui
96bb3b838c
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-14 11:31:53 +08:00
Xinchen Hui
5b87d52041
Fixed typo
2015-03-14 11:31:12 +08:00
Dmitry Stogov
db10b72523
Use fastcall calling convention for most critical ZE subsystems.
2015-03-13 21:10:09 +03:00
Xinchen Hui
326ac546ab
Remove TSRMLS
2015-03-14 01:04:00 +08:00
Xinchen Hui
e827d1a424
Merge branch 'PHP-5.6'
...
Conflicts:
ext/spl/spl_observer.c
2015-03-14 01:01:02 +08:00
Xinchen Hui
396bc00caa
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-14 00:53:32 +08:00
Xinchen Hui
ed59370f0a
Little improvement, update NEWs, added test
2015-03-14 00:52:53 +08:00
Anatol Belski
92d106d26d
fixed test
2015-03-13 17:33:48 +01:00
Anatol Belski
b680ccb2b0
the test shouldn't fail when unlink failed
2015-03-13 17:33:47 +01:00
Dmitry Stogov
2b42d71908
Changed HashTable layout:
...
Removed HashTable->arHash (reduced memory consumption). Now hash slots may be accessed using HT_HASH() macro.
Hash slotas are allocated together with Buckets (before them) and lay in reverse order from HashTable->arData base address (see comments in Zend/zend_types.h)
Indexes in hash table and conflict resolution chains (Z_NEXT) may be stored as indeces or offsets in bytes, depending on system (32 or 64-bit).
HashTable data filelds are reordered to keep the most useful for zend_hash_find() data in the same CPU cache line.
2015-03-13 17:13:19 +03:00
Nikita Popov
0a4a11b73a
Regenerate ext/tokenizer data
2015-03-13 14:14:01 +01:00
Lior Kaplan
a4384bd3d4
s/PHP Version 5/PHP Version 7/g
...
Follow up for d0cb7153
2015-03-13 11:09:42 +02:00
Vektah
482500b455
Fix a leak
2015-03-13 15:54:30 +11:00
Xinchen Hui
d695a44a7e
Revert previously commit by accident
2015-03-13 12:02:39 +08:00
Vektah
950d3d6e9b
Fix bug #69227 and #65967
...
This patch fixes a use (in zend_gc.c) after free (in spl_observer.c).
See https://bugs.php.net/bug.php?id=69227
2015-03-13 15:02:05 +11:00
Wei Dai
25566c67fe
Implement preg_replace_callback_array function
2015-03-13 11:52:36 +08:00
Dmitry Stogov
6289f7e52f
Executor cleanup: fix GOTO and SWITCH VMs, remove aility to build additional PHP-5.0 compatible VM, hide executor implementation details.
2015-03-12 20:39:04 +03:00
Anatol Belski
41571e7fa9
improve ssl operations with possible renegotiation
2015-03-12 17:31:28 +01:00
Anatol Belski
1cf70266e7
use _set_errno where appropriate
2015-03-12 16:24:56 +01:00
Dmitry Stogov
9d71d65388
Fixed tests
2015-03-12 16:58:50 +03:00
Dmitry Stogov
8633685675
Use specialized macro for string zval creation
2015-03-12 16:53:51 +03:00
Anatol Belski
0e30c543ec
upgrade to oniguruman 5.9.6
2015-03-12 13:42:36 +01:00
Anatol Belski
ff337bf52b
expose oniguruma version
2015-03-12 13:28:43 +01:00
Anatol Belski
11716401bd
fix possible unititialized pointer usage
2015-03-12 13:00:36 +01:00
Anatol Belski
1923c7a9b8
simplify condition
2015-03-12 10:21:43 +01:00
Anatol Belski
53b7258797
force ext/ftp to be always shared on Windows
2015-03-12 00:36:22 +01:00
Anatol Belski
2f443acad1
remove ext/openssl dependency for ext/ftp from conf
2015-03-12 00:13:01 +01:00
Anatol Belski
d2ee0840d2
don't depend on ext/openssl for ftp ssl support
...
instead just link against the openssl and init manually, that's
more flexible
2015-03-11 23:58:59 +01:00
Anatol Belski
4ee0395a4a
init mbstring tsrm_ls_cache on MINIT
...
as some globals are accessed there already
2015-03-11 23:42:39 +01:00
Anatol Belski
d5f2b4b398
fix ftp_login with ssl enabled
2015-03-11 21:46:40 +01:00
Anatol Belski
f1a47988b0
added comment
2015-03-11 21:46:39 +01:00
Anatol Belski
167979fe76
enable ftps for shared ext/ftp
2015-03-11 21:46:38 +01:00
Daniel Lowrey
589374d027
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Don't block on crypto data inside stream_select()
2015-03-11 09:45:28 -06:00
Daniel Lowrey
c661121459
Don't block on crypto data inside stream_select()
2015-03-11 09:44:07 -06:00
Nikita Popov
c532376ee7
Fix some memory leaks in WebPhar
2015-03-11 15:27:42 +01:00
Trevor Suarez
98c6567e71
Putting whitespace back to the way it was.
2015-03-11 09:29:08 -04:00
Dmitry Stogov
d68861eb4b
Improved php_json_escape_string()
2015-03-11 15:03:07 +03:00
Dmitry Stogov
781d1c400c
Improved table search
2015-03-11 15:02:47 +03:00
Daniel Lowrey
4a336f5d0b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug# 69215 (Crypto servers should send client CA list)
Conflicts:
ext/openssl/xp_ssl.c
2015-03-10 18:18:19 -06:00
Daniel Lowrey
3f6b12795c
Fix bug# 69215 (Crypto servers should send client CA list)
2015-03-10 18:13:10 -06:00
Dmitry Stogov
026b0adc50
Fixed memory leaks
2015-03-11 01:28:13 +03:00
Dmitry Stogov
48deb1cd94
Free memory if destructor wasn't called
2015-03-11 00:57:28 +03:00
Dmitry Stogov
816b196973
Fixed memory leak
2015-03-10 23:16:09 +03:00
Dmitry Stogov
5d0bacfe67
Merge branch 'PHP-5.6'
...
* PHP-5.6:
We don't cache custom strems with callbacks anymore
Conflicts:
ext/opcache/ZendAccelerator.c
2015-03-10 19:32:38 +03:00
Dmitry Stogov
b52a2940af
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
We don't cache custom strems with callbacks anymore
2015-03-10 19:30:32 +03:00
Dmitry Stogov
c814b3294a
We don't cache custom strems with callbacks anymore
2015-03-10 19:25:30 +03:00
Xinchen Hui
d4c1dca98c
Merge branch 'master' of https://git.php.net/repository/php-src
2015-03-10 17:09:41 +08:00
Xinchen Hui
a5317e9d41
Merge branch 'PHP-5.6'
...
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2015-03-10 15:49:02 +08:00
Xinchen Hui
0584b2df3f
Update NEWS
2015-03-10 15:38:34 +08:00
Dmitry Stogov
a30d328671
Errors converted to exceptions are not "recoverable" anymore.
2015-03-10 10:31:55 +03:00
Xinchen Hui
d25acb5fd0
Revert "Fixed phar file action failure after engine exception rfc been merged"
...
This reverts commit f174859acd
.
2015-03-10 15:03:15 +08:00
Daniel Lowrey
c5c4d22c10
Deprecate "session_meta_capture" SSL context option
...
Meta data about encrypted streams is now available as part of the
"crypto" key in the array returned by stream_get_meta_data(). This
update deprecates the use of the "session_meta_capture" ssl
context option in encrypted streams.
2015-03-09 23:15:57 -06:00
Daniel Lowrey
2dec21634c
Revert "Add stream_socket_crypto_info() function"
...
This reverts commit 13acb7ec65
.
With the added capability to negotiate application layer protocols
via the TLS ALPN extension userland needs a method to access the
negotiated protocol on a given stream. The reverted commit added
a new stream_socket_crypto_info() function for this purpose.
This original approach was discarded in favor of using the
already-existing stream_get_meta_data() API which specifically
exists for just such purposes and requires the addition of no new
functions.
2015-03-09 23:15:57 -06:00
Daniel Lowrey
676a5059b2
Add crypto info to stream_get_meta_data() result on encrypted streams
...
A "crypto" key is added to the output of stream_get_meta_data() calls
when invoked using a stream on which crypto is currently active. The
new key's associated array contains the following keys:
- protocol (string e.g. TLSv1.2, TLSv1.1, etc)
- cipher_name (string)
- cipher_bits (int)
- cipher_version (string)
If the TLS ALPN extension was used to successfully negotiate an
application protocol that protocol's identifier is stored in the
following key:
- alpn_protocol
If no ALPN protocol was negotiated the "alpn_protocol" key is not
present in the crypto meta data array. More meta information
concerning the stream's active encryption state may be added in the
future.
2015-03-09 23:15:57 -06:00
Juan Basso
6b7b5e777f
Renamed test case to match with reported bug
2015-03-10 00:01:26 -04:00
Daniel Lowrey
748433e7bc
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix crypto stream timeout regressions
Conflicts:
ext/openssl/xp_ssl.c
2015-03-09 16:02:04 -06:00
Daniel Lowrey
69691cc8ca
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix crypto stream timeout regressions
2015-03-09 15:55:33 -06:00
Daniel Lowrey
bbfd4a5e62
Fix crypto stream timeout regressions
2015-03-09 15:53:26 -06:00
Reeze Xia
f174859acd
Fixed phar file action failure after engine exception rfc been merged
2015-03-09 17:07:18 +00:00
Xinchen Hui
47f2e42fc9
Remove PHAR_GLOBALS (make it respect ZEND_ENABLE_STATIC_TSRMLS_CACHE)
2015-03-09 23:00:56 +08:00
Juan Basso
cbdeccd6ed
Fixed serialization of non string values on __sleep
...
Returning just N; (null) on the __sleep makes the number of fields/values be incomplete and corrupting the generated value from serialize, making impossible to unserialize it.
2015-03-09 09:04:34 -04:00
Dmitry Stogov
1c94ff0595
Implement engine exceptions
...
RFC: https://wiki.php.net/rfc/engine_exceptions_for_php7
Pending changes regarding naming of BaseException and whether it
should be an interface.
2015-03-09 14:01:32 +01:00
Nikita Popov
a4262827ea
Fix ReflectionFunction::isDeprecated() test
...
We currently don't have deprecated functions ... so just switch
this to testing a non-deprecated function.
2015-03-09 12:27:06 +01:00
Nikita Popov
7810659cc3
Removed deprecated mcrypt_ecb() etc
2015-03-09 11:37:13 +01:00
Nikita Popov
c488a45701
Remove deprecated mcrypt_generic_end() alias
2015-03-09 11:10:52 +01:00
Nikita Popov
a81e65a501
Remove xsl.security_prefs ini option
...
Conflicts:
ext/xsl/php_xsl.c
ext/xsl/xsltprocessor.c
2015-03-09 11:06:18 +01:00
Nikita Popov
b5184ef336
Remove unsafe curl file uploads
...
The option CURLOPT_SAFE_UPLOAD still exists, but cannot be disabled.
2015-03-09 11:00:04 +01:00
Xinchen Hui
c24afc8d8f
Revert commit by mistake
2015-03-09 17:27:51 +08:00
Xinchen Hui
64bbc98dff
Merge branch 'PHP-5.6'
...
Conflicts:
ext/mysqli/php_mysqli_structs.h
2015-03-09 17:23:34 +08:00
Xinchen Hui
4ca14f681e
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-09 17:23:04 +08:00
Xinchen Hui
9af1383a3f
Revert "Fix #63486 "
...
This reverts commit f4c96ffcb5
.
2015-03-09 17:22:56 +08:00
Jeff Welch
fdbdb11514
Fix #69202 : FILTER_FLAG_STRIP_BACKTICK ignored unless other flags are used.
2015-03-09 17:14:47 +08:00
Jeff Welch
66a2c528fe
Fix #69202 : FILTER_FLAG_STRIP_BACKTICK ignored unless other flags are used.
2015-03-09 17:08:35 +08:00
Xinchen Hui
f66bef2414
Fixed build
2015-03-09 15:50:52 +08:00
Masaki Kagaya
9d81d7ff70
added missing parentheses
...
added test case for bug #68846
replaced tab with space
added missing parentheses again
See also: http://icu-project.org/docs/papers/gb18030.html#h7
2015-03-08 23:45:11 -07:00
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
Masaki Kagaya
934d6ed900
added missing parentheses
...
added test case for bug #68846
replaced tab with space
added missing parentheses again
See also: http://icu-project.org/docs/papers/gb18030.html#h7
2015-03-08 23:40:56 -07:00
Julien Pauli
7d47d9fe23
Fix #67626
2015-03-08 23:40:55 -07:00
Julien Pauli
7684d72df8
Fix #63486
2015-03-08 23:40:55 -07:00
Masaki Kagaya
fa72f1ea86
added missing parentheses
...
added test case for bug #68846
replaced tab with space
added missing parentheses again
See also: http://icu-project.org/docs/papers/gb18030.html#h7
2015-03-08 23:39:04 -07:00
Stanislav Malyshev
a8da0a9620
Merge branch 'pull-request/1104' into PHP-5.5
...
* pull-request/1104:
Fix #63486
2015-03-08 23:21:53 -07:00
Stanislav Malyshev
43b426fbc4
Merge branch 'pull-request/1106' into PHP-5.5
...
* pull-request/1106:
Fix #67626
2015-03-08 22:52:21 -07:00
Xinchen Hui
7bf082d638
Merge branch 'filter/adjust-logic' of https://github.com/whatthejeff/php-src
2015-03-09 11:43:10 +08: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
876a9be3ee
Merge branch 'pull-request/1129'
...
* pull-request/1129:
Array - make krsort FAST_ZPP compatibility
2015-03-08 17:04:13 -07: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