php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-04 22:52:40 +02:00
Code Issues Packages Projects Releases Wiki Activity
85,350 Commits 547 Branches 1,481 Tags
2a9daf2e15fd145eb89c6b7cd9efa87afa5aa8cc
Commit Graph

85350 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Popov
2a9daf2e15 Drop zend_long64 in favor of int64_t 
Also drop ZEND_HAVE_LONG64, because we already require the
presence of a int64_t type.
 2014-10-16 12:42:22 +02:00
Dmitry Stogov
9527877930 Removed deprecated fields 2014-10-16 13:41:27 +04:00
Remi Collet
88d68aa3e2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  cleanup NEWS
 2014-10-15 19:49:41 +02:00
Remi Collet
a3beb42ded NEWS 2014-10-15 19:49:22 +02:00
Remi Collet
3d9f460313 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  cleanup NEWS
 2014-10-15 19:48:25 +02:00
Remi Collet
a1abdba1eb cleanup NEWS 2014-10-15 19:47:55 +02:00
Ferenc Kovacs
c03b6e1701 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  Fixed Bug #65171 imagescale() fails
  Revert "Bug #41631: Observe socket read timeouts in SSL streams"
 2014-10-15 19:43:30 +02:00
Ferenc Kovacs
cfa1028d7e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fixed Bug #65171 imagescale() fails
  Revert "Bug #41631: Observe socket read timeouts in SSL streams"

Conflicts:
	ext/openssl/xp_ssl.c
 2014-10-15 19:42:51 +02:00
Ferenc Kovacs
d2ab6e1d15 Merge branch 'PHP-5.6' 
* PHP-5.6:
  removing the NEWS entry as we had to revert this fix for now
  Revert "Merge branch 'PHP-5.5' into PHP-5.6"
  Revert "fix TS build"
  Revert "Merge branch 'PHP-5.4' into PHP-5.5"
  Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams"
  Revert "Bug #41631: Fix regression from first attempt (6569db8)"
 2014-10-15 19:41:27 +02:00
Ferenc Kovacs
2109f5bfe3 removing the NEWS entry as we had to revert this fix for now 2014-10-15 19:36:13 +02:00
Ferenc Kovacs
feadaaed56 Revert "Merge branch 'PHP-5.5' into PHP-5.6" 
This reverts commit 98e67add15, reversing
changes made to 2cdc1a2b74.
 2014-10-15 19:34:07 +02:00
Ferenc Kovacs
4fb998d42f Revert "fix TS build" 
This reverts commit 84a4041ba4.
 2014-10-15 19:33:47 +02:00
Ferenc Kovacs
7b8222aa44 Revert "Merge branch 'PHP-5.4' into PHP-5.5" 
This reverts commit 30a73658c6, reversing
changes made to 7fac56e072.
 2014-10-15 19:33:31 +02:00
Ferenc Kovacs
528e4166a6 Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams" 
This reverts commit f86b2193a4.
 2014-10-15 19:32:46 +02:00
Ferenc Kovacs
ff91a48f6e Revert "Bug #41631: Fix regression from first attempt (6569db8)" 
This reverts commit 372844918a.
 2014-10-15 19:32:14 +02:00
Remi Collet
503f8193e8 NEWS 2014-10-15 19:16:45 +02:00
Remi Collet
2728e6f017 Fixed Bug #65171 imagescale() fails 
Third param (height) is set as optional,
but default value = -1 is incorrect

Compute correct height to preserve ratio.
 2014-10-15 19:13:25 +02:00
Tjerk Meesters
7e116a3baa Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68234
 2014-10-15 21:13:13 +08:00
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