1b15620744
Fix build with gmp < 4.2
...
See 3d6d863ccbacd7fcf55f
2014-11-13 13:08:00 +01:00
07655ffe7e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #53829 Compiling PHP with large file support will replace function gzopen by gzopen64
2014-11-12 11:22:48 +01:00
65fee90462
Fixed bug #53829 Compiling PHP with large file support will replace function gzopen by gzopen64
2014-11-12 11:21:11 +01:00
9e072d9565
Remove unneeded md5 hashing from PHP-5.6 branch.
...
It's removed from master already by my previous commit.
2014-11-12 13:43:54 +09:00
1b143f4033
fix loop - size_t is unsigned so can not be negative
2014-11-11 16:33:02 -08:00
4571cc2195
fix copypaste error
2014-11-11 16:33:02 -08:00
a19d96fc58
Merge branch 'PHP-5.5' into PHP-5.6
2014-11-11 14:01:26 -03:00
695a102ede
- Updated to version 2014.10 (2014j)
2014-11-11 14:01:24 -03:00
e003c56c74
Merge branch 'PHP-5.5' into PHP-5.6
2014-11-11 16:23:18 +08:00
327d4f9afb
Fixed bug #68361 (Segmentation fault on SoapClient::__getTypes)
2014-11-11 16:22:49 +08:00
96c5c1ef59
Fix skipif test here
2014-11-10 10:42:57 -08:00
bff7dc70d8
Fix skipif test here
2014-11-10 10:42:17 -08:00
e6581d52cc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix opcache.revalidate_freq per-request behavior
2014-11-07 10:17:48 +03:00
033abd6d77
Fix opcache.revalidate_freq per-request behavior
2014-11-07 10:16:25 +03:00
8fccf0bac9
Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)
2014-11-06 16:34:47 +01:00
8fdc4d8797
Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)
2014-11-06 15:47:32 +01:00
4dd3fbfcd2
Fixed bug #68331 - This was partial patch for https://wiki.php.net/rfc/session-lock-ini
2014-11-06 13:06:29 +09:00
d4050f42fd
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix dir separator in test
2014-11-05 15:43:13 +01:00
53266476e6
fix dir separator in test
2014-11-05 15:42:45 +01:00
342d56b23d
arg1-3 are not variable names to use; removed useless buffer variable
2014-11-04 16:59:32 +01:00
90ba99a2c2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Initialize the offset table - PCRE may sometimes miss offsets
set default response code to 200
set default response code to 200
fix NEWS & version
NEWS
Fix bug #68283 : fileinfo: out-of-bounds read in elf note headers
Fix bug #68113 (Heap corruption in exif_thumbnail())
Fix bug #68089 - do not accept options with embedded \0
Fixed bug #68044 : Integer overflow in unserialize() (32-bits only)
Fix bug #68027 - fix date parsing in XMLRPC lib
2014-11-03 11:38:29 -08:00
279550ee85
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Initialize the offset table - PCRE may sometimes miss offsets
set default response code to 200
fix NEWS & version
NEWS
Fix bug #68283 : fileinfo: out-of-bounds read in elf note headers
Fix bug #68113 (Heap corruption in exif_thumbnail())
Fix bug #68089 - do not accept options with embedded \0
Fixed bug #68044 : Integer overflow in unserialize() (32-bits only)
Fix bug #68027 - fix date parsing in XMLRPC lib
Conflicts:
configure.in
ext/curl/interface.c
main/php_version.h
2014-11-03 11:37:43 -08:00
c351b47ce8
Initialize the offset table - PCRE may sometimes miss offsets
2014-11-03 11:31:02 -08:00
e12d69df0c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66584 Segmentation fault on statement deallocation
2014-11-01 19:20:43 +01:00
69f6aee35c
Fixed bug #66584 Segmentation fault on statement deallocation
2014-11-01 19:19:56 +01:00
00b50850eb
Add credit
2014-11-01 22:29:55 +08:00
1b1f7c627a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix ZTS build
2014-10-31 19:53:39 +01:00
1fc80d0ca7
fix ZTS build
2014-10-31 19:53:16 +01:00
e797db8909
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests
Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction
2014-10-31 18:57:59 +01:00
29ee694341
Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests
2014-10-31 18:54:16 +01:00
9580fcfedd
Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction
2014-10-31 18:11:32 +01:00
d017c4bf3a
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
2014-10-31 17:36:33 +08:00
d9d181e5ad
Fixed Bug #68104 (Segfault while pre-evaluating a disabled function)
2014-10-31 17:32:23 +08:00
fdbfcc0b51
dll export APIs needed by phpdbg
2014-10-29 19:32:52 +01:00
eb4e4b7bca
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed test to work with recent libcurl versions
PHP 5.5.20 now
Conflicts:
configure.in
main/php_version.h
2014-10-29 11:32:12 +01:00
daf9357d27
Fixed test to work with recent libcurl versions
2014-10-29 11:28:27 +01:00
47acdcb176
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Ensure we have enough input data before parsing date
2014-10-28 08:50:48 +01:00
13a218d328
Ensure we have enough input data before parsing date
...
This check have be removed in
http://git.php.net/?p=php-src.git;a=commit;h=ba2f87b50667f147c198abd31fc31eb09522f3d7
But the parser really need 17 char.
And the string need to be nul terminated for this check
So avoid reading random byte from memory.
2014-10-28 08:48:22 +01:00
0146505187
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fix bug #63595 GMP memory management conflicts with other libraries using GMP
Conflicts:
ext/gmp/gmp.c
2014-10-27 07:50:42 +01:00
3c925b18fa
Fix bug #63595 GMP memory management conflicts with other libraries using GMP
...
Drop use of php memory allocators as this raise various conflicts
with other extensions and libraries which use libgmp.
No other solution found.
We cannot for ensure correct use of allocator with shared lib.
Some memory can allocated before php init
Some memory can be freed after php shutdown
Known broken run cases
- php + curl + gnutls + gmp
- mod_gnutls + mod_php + gnutls + gmp
- php + freetds + gnutls + gmp
- php + odbc + freetds + gnutls + gmp
- php + php-mapi (zarafa) + gnutls + gmp
2014-10-27 07:45:34 +01:00
25e3560546
Merge branch 'PHP-5.5' into PHP-5.6
2014-10-26 10:54:09 -04:00
22b9f16e9a
- Updated to version 2014.9 (2014i)
2014-10-26 10:54:07 -04:00
7e5bd4ec69
updated libmagic.patch in 5.6
2014-10-25 12:03:49 +02:00
270df3ffd6
updated libmagic.patch in 5.5
2014-10-25 12:01:58 +02:00
cefa310cf9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fix bug #68283 : fileinfo: out-of-bounds read in elf note headers
2014-10-25 11:30:29 +02:00
5b295bf191
Fix bug #68283 : fileinfo: out-of-bounds read in elf note headers
...
Upstream commit
https://github.com/file/file/commit/39c7ac1106be844a5296d3eb5971946cc09ffda0
CVE -2014-3710
(cherry picked from commit 1803228597
2014-10-25 11:29:16 +02:00
1803228597
Fix bug #68283 : fileinfo: out-of-bounds read in elf note headers
...
Upstream commit
https://github.com/file/file/commit/39c7ac1106be844a5296d3eb5971946cc09ffda0
CVE -2014-3710
2014-10-22 15:37:04 +02:00
ef2a2fa3a1
Fix bug #68224 buffer-overflow in /ext/fileinfo/libmagic/readcdf.c caught by AddressSanitizer
...
Upstream commit
https://github.com/file/file/commit/f28fbb947e3aa55fc40b09820f59ebff6f66f213
2014-10-22 15:24:59 +02:00
e0b247bc87
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
initialize lineno before calling compile file file in phar
News entry for new curl constants
2014-10-20 15:54:33 +02:00
37d5a2b18f
initialize lineno before calling compile file file in phar
2014-10-20 15:53:32 +02:00
Remi Collet