clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
94,449 Commits 491 Branches 1,363 Tags 837 MiB
90e11e0c13
Commit Graph

94449 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph M. Becker
90e11e0c13 Update NEWS 2016-07-11 16:09:12 +02:00
Christoph M. Becker
23d4c9e6c7 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-11 16:08:10 +02:00
Christoph M. Becker
966311e627 Bug #66836 has been fixed 2016-07-11 16:06:35 +02:00
Julien Pauli
fc2c301fe2 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Remove needless zeroing of anonymously mmap'd memory
  Remove needless zeroing of anonymously mmap'd memory
 2016-07-11 14:58:55 +02:00
Julien Pauli
2552cf248d Remove needless zeroing of anonymously mmap'd memory 2016-07-11 14:58:12 +02:00
Michael McConville
9dd5d96332 Remove needless zeroing of anonymously mmap'd memory 
All existing systems zero anonymously mmapped memory, and if I
understand correctly POSIX will be specifying this soon. Many projects
already rely on it, so no reasonable system would return memory of
unspecified value.
 2016-07-11 14:56:17 +02:00
Derick Rethans
7759d6b0db Merge branch 'PHP-5.6' into PHP-7.0 2016-07-11 11:32:10 +01:00
Derick Rethans
6a5e1783b7 Generate new .c file from .re file, as that was missing on my previous commit 2016-07-11 11:31:43 +01:00
Xinchen Hui
a19655cfe3 Fixed bug #72571 (SQLite3::bindValue, SQLite3::bindParam crash) 2016-07-11 11:51:19 +08:00
Matteo Beccati
4d677ae0e2 Fixed bug #72570 Segmentation fault when binding parameters on a query without placeholders 2016-07-10 14:36:07 +02:00
Matteo Beccati
11d74b5b79 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #70313 PDO statement fails to throw exception
 2016-07-10 14:34:59 +02:00
Matteo Beccati
219ebcb689 Fixed bug #70313 PDO statement fails to throw exception 2016-07-10 14:33:56 +02:00
Julien Pauli
6725863993 Updated NEWS 2016-07-08 16:32:32 +02:00
Julien Pauli
13a5c54068 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Updated NEWS
  update filter_var filters for ipv4 addresses to reflect rfc6890
 2016-07-08 16:31:53 +02:00
Julien Pauli
51d19891a4 Updated NEWS 2016-07-08 16:31:42 +02:00
Jos Elstgeest
6fc7817558 update filter_var filters for ipv4 addresses to reflect rfc6890 2016-07-08 16:30:06 +02:00
Adam Baratz
8db64e919c Correct for connection with PDO::ATTR_STRINGIFY_FETCHES set to false 2016-07-08 15:54:52 +02:00
Julien Pauli
a8df121e18 Updated NEWS 2016-07-08 15:06:21 +02:00
Julien Pauli
87fe485c35 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Updated NEWS
  Backported bug #71144 (Segmentation fault when using cURL with ZTS)
  fix bug #72024 (microtime() leaks memory)

Conflicts:
	ext/curl/interface.c
 2016-07-08 15:05:13 +02:00
Julien Pauli
1071a2655f Updated NEWS 2016-07-08 15:04:13 +02:00
Julien Pauli
78d5783b62 Backported bug #71144 (Segmentation fault when using cURL with ZTS) 2016-07-08 14:58:56 +02:00
Michael Maroszek
0be13d2dc2 fix bug #72024 (microtime() leaks memory) 2016-07-08 14:36:44 +02:00
Remi Collet
7ae00f08cf NEWS 2016-07-08 10:47:40 +02:00
Remi Collet
99d6e09c3d Fixed Bug #72564 boolean always deserialized as "true" 2016-07-08 10:46:33 +02:00
Remi Collet
76a143c27c Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  add test for bug #72564 (7.x regression)
 2016-07-08 10:45:32 +02:00
Remi Collet
bfc42211d3 add test for bug #72564 (7.x regression) 2016-07-08 10:45:13 +02:00
Christopher Jones
fae6407314 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-07 11:52:39 +10:00
Christopher Jones
8b905e337c Mask DB usernames from expected test output for test portability 2016-07-07 11:52:17 +10:00
Ferenc Kovacs
3580b9f8b6 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-07 01:49:05 +02:00
Ferenc Kovacs
2b7cd813e7 merge NEWS blocks 2016-07-07 01:46:02 +02:00
Nikita Popov
06b6cb0ab0 Add NEWS entries 2016-07-07 01:31:04 +02:00
Lauri Kenttä
3104759915 base64_decode: fix bug #72264 ('VV= =' shouldn't fail in strict mode) 2016-07-07 01:27:23 +02:00
Lauri Kenttä
0259459486 base64_decode: remove redundant code 
case 1 is already handled in the first lines of the for loop;
it would only be entered in the invalid case where the string
continues past the defined length (ch != 0 but length-- == 0).

case 2 and case 3 are redundant, since k >= j and later the
string is truncated to j characters anyway.
 2016-07-07 01:27:23 +02:00
Lauri Kenttä
c1ac081bf1 base64_decode: fix bug #72263 (skips char after padding) 2016-07-07 01:27:23 +02:00
Lauri Kenttä
b9c9be13cc base64_decode: fix bug #72152 (fail on NUL bytes in strict mode) 
This added check is actually for NOT failing in NON-strict mode.
The ch == -2 check later causes the desired failure in strict mode.
 2016-07-07 01:27:23 +02:00
Lauri Kenttä
ef6f163161 base64_decode: remove redundant check 
If length == 0 || *current != '=' is false, the for loop will always
end up in this same point, until the if statement becomes true.
Thus, the if statement is not needed.
 2016-07-07 01:27:23 +02:00
Lauri Kenttä
c65de8ac13 base64_decode: reorder to fix out of bounds read 2016-07-07 01:27:22 +02:00
Ferenc Kovacs
ea640e6117 Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	configure.in
	main/php_version.h
 2016-07-07 01:16:58 +02:00
Ferenc Kovacs
c1280db28a 5.6.25 is next 2016-07-07 00:09:48 +02:00
Derick Rethans
a4e140e6ab Updated to version 2016.6 (2016f) 2016-07-06 11:15:45 +01:00
Derick Rethans
7008a36627 Empty merge 2016-07-06 11:15:44 +01:00
Derick Rethans
884db2f7be Updated to version 2016.6 (2016f) 2016-07-06 11:15:42 +01:00
Matteo Beccati
ff7c981d19 Rewrite test to avoid sending emails 
A properly configured email server was generating bounce emails when running
the test.
 2016-07-06 07:08:43 +02:00
Christoph M. Becker
869604eefb Update NEWS 2016-07-05 16:49:40 +02:00
Christoph M. Becker
c015095042 Merge branch 'PHP-5.6' into PHP-7.0 
# Resolved conflicts:
#	ext/spl/spl_directory.c
 2016-07-05 16:43:39 +02:00
Valentin VALCIU
4c24f170ea Fix bug #55701: GlobIterator throws LogicException 
GlobIterator throws LogicException with message 'The parent constructor was
not called' on its first operation when the glob expression doesn't match
any file. It also throws on the first operation after the iteration
completes, when the glob expression matches some files.

# Resolved conflicts:
#	ext/spl/spl_directory.c
 2016-07-05 16:39:25 +02:00
Adam Baratz
f22bc6438d Use size_t instead of int for loop counter 2016-07-05 16:09:27 +02:00
Anatol Belski
4576c41291 fix possible optimization bug 2016-07-05 14:57:16 +02:00
Nikita Popov
8a555d7c66 Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	Zend/zend_compile.c
 2016-07-05 14:32:38 +02:00
Pedro Magalhães
08777e9615 Don't enforce LSP if prototype method is private 
Fixes bug #72496.
 2016-07-05 14:30:22 +02:00