clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-25 11:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
85,382 Commits 493 Branches 1,366 Tags 849 MiB
7a1a0f39d0
Commit Graph

85382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tjerk Meesters
836a5dfddb Fixed bug #68234 
Certificate will now expire in 2034
 2014-10-15 21:12:13 +08:00
Dmitry Stogov
ed18d67c5e Fixed bug #68215 (Behavior of foreach has changed) 2014-10-15 17:02:54 +04:00
Julien Pauli
6d9c9f8f04 Revert "Bug #41631: Observe socket read timeouts in SSL streams" 
This reverts commit 6569db8808.

Conflicts:
	ext/openssl/xp_ssl.c
 2014-10-15 14:38:12 +02:00
Ferenc Kovacs
c32614370f Merge branch 'PHP-5.6' 
* PHP-5.6:
  PHP-5.6.3 is next
  update NEWS, 5.6.2 will be a security-only release

Conflicts:
	configure.in
	main/php_version.h
 2014-10-15 14:10:38 +02:00
Ferenc Kovacs
646b4cca85 PHP-5.6.3 is next 2014-10-15 14:08:32 +02:00
Ferenc Kovacs
b85b87fabc update NEWS, 5.6.2 will be a security-only release 2014-10-15 14:07:40 +02:00
Dmitry Stogov
52b93004d0 Fixed ext/standard/tests/strings/pack64_32.phpt failure (In PHP7, we must not free array of arguments recieved using "+") 2014-10-15 12:38:04 +04:00
Stanislav Malyshev
01d17228dc Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix return code (merges are hard :( )
 2014-10-14 11:45:01 -07:00
Stanislav Malyshev
47a1447cc8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix return code (merges are hard :( )
 2014-10-14 11:43:34 -07:00
Stanislav Malyshev
bb3d43fa05 Fix return code (merges are hard :( ) 2014-10-14 11:42:33 -07:00
Stanislav Malyshev
d9559d0ecd fix bad merge 2014-10-14 11:17:48 -07:00
Stanislav Malyshev
abe907b343 Merge branch 'PHP-5.6' 
* PHP-5.6:
  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
  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:
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
 2014-10-14 10:53:05 -07:00
Stanislav Malyshev
4a38cc0a3c Fix bug #68113 (Heap corruption in exif_thumbnail()) 2014-10-14 10:51:46 -07:00
Stanislav Malyshev
81b67937e4 Fix bug #68089 - do not accept options with embedded \0 
Conflicts:
	ext/curl/interface.c
 2014-10-14 10:51:46 -07:00
Stanislav Malyshev
3eb679b952 Fixed bug #68044: Integer overflow in unserialize() (32-bits only) 2014-10-14 10:51:24 -07:00
Stanislav Malyshev
2b261789a6 Fix bug #68027 - fix date parsing in XMLRPC lib 2014-10-14 10:49:01 -07:00
Stanislav Malyshev
3e4cef131e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  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-10-14 10:45:47 -07:00
Stanislav Malyshev
f9ba0a157f Fix bug #68113 (Heap corruption in exif_thumbnail()) 2014-10-14 10:45:36 -07:00
Stanislav Malyshev
71b63fc701 Fix bug #68089 - do not accept options with embedded \0 
Conflicts:
	ext/curl/interface.c
 2014-10-14 10:45:35 -07:00
Stanislav Malyshev
88eb7ea47d Fixed bug #68044: Integer overflow in unserialize() (32-bits only) 2014-10-14 10:44:57 -07:00
Stanislav Malyshev
2142d78281 Fix bug #68027 - fix date parsing in XMLRPC lib 2014-10-14 10:44:39 -07:00
Stanislav Malyshev
ddb207e7fa Fix bug #68113 (Heap corruption in exif_thumbnail()) 2014-10-14 10:44:00 -07:00
Stanislav Malyshev
d1e030db02 Fix bug #68089 - do not accept options with embedded \0 
Conflicts:
	ext/curl/interface.c
 2014-10-14 10:43:59 -07:00
Stanislav Malyshev
9aa9014523 Fixed bug #68044: Integer overflow in unserialize() (32-bits only) 2014-10-14 10:43:13 -07:00
Stanislav Malyshev
44035de79f Fix bug #68027 - fix date parsing in XMLRPC lib 2014-10-14 10:43:12 -07:00
Tjerk Meesters
1f4f2ef403 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68128

Conflicts:
	ext/spl/spl_iterators.c
 2014-10-14 23:00:17 +08:00
Tjerk Meesters
fb35d7c56e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68128
 2014-10-14 22:50:07 +08:00
Tjerk Meesters
71ba533640 Fixed bug #68128 
Three issues are addressed:

- RecursiveRegexIterator::accept() should accept non-empty arrays without
  applying any regular expression and RegexIterator::accept() should not accept
  an array.
- RegexIterator::accept() should not accept an atom that fails to match
  anything, even when PREG_PATTERN_ORDER is used (which would return an array
  of empty arrays).
- RecursiveRegexIterator::getChildren() should pass all constructor arguments
  to its child iterator instead of just the regular expression.
 2014-10-14 22:49:01 +08:00
Dmitry Stogov
d2daa19701 Added API function to retrive current custom heap handlers 2014-10-14 14:20:25 +04:00
Stanislav Malyshev
afdaedaa26 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS and UPGRADING
  Upated NEWS
  Address issues raised by @nikic
  Make sure min < max
  Mersenne Twister was added in GMP 4.2
  Add test files
  Add gmp_random_bits(bits) and gmp_random_range(min, max)
  Change GMPs default PRNG to Mersenne Twister

Conflicts:
	ext/gmp/gmp.c
 2014-10-14 00:43:15 -07:00
Stanislav Malyshev
4773c1dfdc update NEWS and UPGRADING 2014-10-14 00:36:36 -07:00
Stanislav Malyshev
8615e42942 Merge branch 'pull-request/839' into PHP-5.6 
* pull-request/839:
  Upated NEWS
  Address issues raised by @nikic
  Make sure min < max
  Mersenne Twister was added in GMP 4.2
  Add test files
  Add gmp_random_bits(bits) and gmp_random_range(min, max)
  Change GMPs default PRNG to Mersenne Twister
 2014-10-14 00:33:16 -07:00
Dmitry Stogov
2842766d7f Allow to substitute storage layer in memory manager. 2014-10-14 09:41:16 +04:00
Anatol Belski
65eb8ef8d0 fix several datatype mismatch warnings 2014-10-13 18:43:14 +02:00
Anatol Belski
66e47446e4 fix signed/unsigned mismatch warning 2014-10-13 18:43:13 +02:00
Anatol Belski
b2de68a81f more signed/unsigned mismatch fix 2014-10-13 18:43:12 +02:00
Anatol Belski
946668d037 fix signed/unsigned mismatch warning 2014-10-13 18:43:11 +02:00
Anatol Belski
97319bc833 fix signed/unsigned mismatch 2014-10-13 18:43:10 +02:00
Anatol Belski
84477c7c39 fix some signed/unsigned mismatch 2014-10-13 18:43:09 +02:00
Anatol Belski
784c235f40 missing include for strlen proto 2014-10-13 18:43:08 +02:00
Nikita Popov
5d94ba6ec3 More fixes for array/object casts with temporary variables 2014-10-13 15:31:59 +02:00
Nikita Popov
e62edf2e58 Fix array/object cast of refcounted tmp var 2014-10-13 15:31:59 +02:00
Nikita Popov
2622cfc2fb Deref right value for compound assign ops 
Currently we do not support IS_REFERENCE operands for most of our
*_function's (should we?), so we need to deref here.
 2014-10-13 15:31:59 +02:00
Dmitry Stogov
702a2dfb3e Merge branch 'PHP-5.6' 
* PHP-5.6:
  We can't eliminate FETCH_CONSTANT opcodes for constants represented by AST.

Conflicts:
	ext/opcache/Optimizer/pass1_5.c
 2014-10-13 14:10:44 +04:00
Dmitry Stogov
7acba332fe We can't eliminate FETCH_CONSTANT opcodes for constants represented by AST. 2014-10-13 14:07:37 +04:00
Nikita Popov
0b09ba84b9 Ensure __LINE__ is always accurate 2014-10-12 20:55:52 +02:00
Nikita Popov
b7e139a59c Fix incdec of referenced properties 
I thought these SEPARATE_ZVAL_IF_NOT_REF usages were safe at first,
because incdec op supports reference variables. However this
violates the constraint that IS_TMP_VAR variables may not be
references (which is an issue if you use the result of the incdec
op).

Still need to fix the cases where read_property/write_property is
used.
 2014-10-12 20:55:52 +02:00
Nikita Popov
016a96c7c2 Fix ::jsonSerialize() failure message 2014-10-12 20:55:51 +02:00
Nikita Popov
c4ab08ac9d Fix invalid zend_string_frees in reflection 
zend_lookup_class can share the name
 2014-10-12 20:55:51 +02:00
Nikita Popov
471e71537f Remove retval member in spl_dllist 
Seems pretty useless, unless I'm missing something?
 2014-10-12 20:55:51 +02:00