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
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
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
Daniel Lowrey
00c35cb6a5
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly)
Conflicts:
ext/openssl/openssl.c
2015-03-06 11:31:04 -07:00
Daniel Lowrey
0928bad9ac
Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly)
2015-03-06 11:29:56 -07:00
Anatol Belski
be7371f9ff
fix data type
2015-03-06 16:49:08 +01:00
Dmitry Stogov
53d8e5fc63
Improved hash key manangement code
2015-03-06 16:26:40 +03:00
Tjerk Meesters
1236a30746
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #68917 (parse_url fails on some partial urls)
Update test to run locally instead of remotely
2015-03-06 20:59:52 +08:00
Tjerk Meesters
469b5a9584
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68917 (parse_url fails on some partial urls)
2015-03-06 20:58:20 +08:00
Tjerk Meesters
d7fb52ea20
Fixed bug #68917 (parse_url fails on some partial urls)
2015-03-06 20:51:22 +08:00
Dmitry Stogov
4bc7ee2eb7
Fixed conditions
2015-03-06 11:00:19 +03:00
Dmitry Stogov
8308e617f1
Revert "Fix logical-op-parentheses warning"
...
This reverts commit b7408234b9
.
2015-03-06 10:56:19 +03:00
Daniel Lowrey
eef261f0e4
Update test to run locally instead of remotely
2015-03-05 22:01:15 -07:00
Daniel Lowrey
e82878a200
Update test to run locally instead of remotely
2015-03-05 22:00:38 -07:00
Reeze Xia
b7408234b9
Fix logical-op-parentheses warning
...
What a condition ;-)
2015-03-06 12:20:01 +08:00
Daniel Lowrey
3e0a1a71e9
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug (#69195 Inconsistent stream crypto values across versions)
Conflicts:
ext/standard/http_fopen_wrapper.c
2015-03-05 21:18:09 -07:00
Daniel Lowrey
10bc5fd4c4
Fixed bug ( #69195 Inconsistent stream crypto values across versions)
...
PHP 5.6.0 altered the semantics of the following constants:
- STREAM_CRYPTO_METHOD_SSLv23_CLIENT
- STREAM_CRYPTO_METHOD_SSLv23_SERVER
- STREAM_CRYPTO_METHOD_TLS_CLIENT
- STREAM_CRYPTO_METHOD_TLS_SERVER
Instead of representing the SSLv23_*() handshake methods the v23
constants were changed to allow only SSLv2 or SSLv3 connections.
Likewise, the TLS methods were modified from using only the TLSv1
handshake to allowing TLS1,1.1, and 1.2. This created a situation
in which users upgrading from previous versions faced a potential
security degradation if they did not update code to use different
constants. In the interest of compatibility across PHP versions
the original semantics have been restored with the following
caveat:
**IMPORTANT**
The SSLv23 client/server methods will no longer negotiate the use
of the insecure SSLv2 or SSLv3 protocols by default. Users wishing
to allow these protocols must explicitly add them to the method
bitmask via the appropriate flags.
2015-03-05 21:09:39 -07:00
Daniel Lowrey
88cfc6ccb6
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix stream_select() issue with OpenSSL buffer
Conflicts:
main/streams/streams.c
2015-03-05 17:53:04 -07:00
Chris Wright
e7df9d710c
Fix stream_select() issue with OpenSSL buffer
...
Ensure data from OpenSSL internal buffer has been
transfered to PHP stream buffer before a select()
emulation operation is performed
Addresses bug #65137
https://bugs.php.net/bug.php?id=65137
Conflicts:
ext/openssl/xp_ssl.c
2015-03-05 17:18:14 -07:00
Dmitry Stogov
28e42b1ded
Improved hash key manangement code
2015-03-06 02:13:47 +03:00
Daniel Lowrey
ca24d19a89
Really fix zts this time
2015-03-05 14:09:25 -07:00
Daniel Lowrey
927b137c1b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix ZTS
Fix ZTS build
Conflicts:
ext/openssl/openssl.c
ext/openssl/xp_ssl.c
2015-03-05 12:24:04 -07:00
Daniel Lowrey
c985ec737d
Fix ZTS
2015-03-05 12:19:15 -07:00
Daniel Lowrey
010f17534f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix ZTS build
2015-03-05 12:13:33 -07:00
Daniel Lowrey
e892f5382f
Fix ZTS build
2015-03-05 12:12:55 -07:00
Adam Harvey
7fa1009560
Like Shady, --with-mysql-sock is back.
...
As Matteo pointed out, MySQLi and PDO_MySQL both rely on this.
2015-03-05 19:00:02 +00:00
Daniel Lowrey
c34ee4b146
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug #67403 (Add signatureType to openssl_x509_parse)
5.5.24 now
Conflicts:
ext/openssl/openssl.c
2015-03-05 10:27:11 -07:00