php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 18:23:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
85,384 Commits 549 Branches 1,485 Tags
ae127faf5bcafc64a8dfdba6baad5f86ef5f94b0
Commit Graph

36480 Commits

Author SHA1 Message Date
Anatol Belski 7a1a0f39d0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  initialize lineno before calling compile file file in phar
  News entry for new curl constants
 2014-10-20 15:55:05 +02:00
Anatol Belski 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
Anatol Belski 37d5a2b18f initialize lineno before calling compile file file in phar 2014-10-20 15:53:32 +02:00
Dmitry Stogov ab539e177e Removed old irrelevant comment 2014-10-20 13:52:28 +04:00
Dmitry Stogov fb85d0322d Fixed compilation 2014-10-17 19:25:43 +04:00
Dmitry Stogov 7471c21781 Optimized property access handlers. Removed EG(std_property_info). 2014-10-17 19:10:05 +04:00
Matteo Beccati 9935bf7df7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68199 (PDO::pgsqlGetNotify doesn't support NOTIFY payloads)
  News entry for new curl constants
 2014-10-17 16:48:58 +02:00
Matteo Beccati 8c5e2e66bc Fixed bug #68199 (PDO::pgsqlGetNotify doesn't support NOTIFY payloads) 2014-10-17 16:22:52 +02:00
Dmitry Stogov 35dc0a2e30 array_pop/array_shift optimization 2014-10-17 12:30:27 +04:00
Anatol Belski 1f6bd98143 check for zlib headers as well as lib for mysqlnd 2014-10-17 10:09:40 +02:00
Anatol Belski 35d703d00a a realpath cache key can be int or float, catching this 2014-10-17 10:09:39 +02:00
Rasmus Lerdorf 2a8f7f8824 Merge branch 'PHP-5.6' 
* PHP-5.6:
  TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247
 2014-10-16 21:28:49 -07:00
Rasmus Lerdorf 5606466624 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247
 2014-10-16 21:28:20 -07:00
Rasmus Lerdorf 2b5bffe6c7 TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247 2014-10-16 21:25:29 -07:00
Nikita Popov fc6ce7d1c1 Fix array_keys() on $GLOBALS 2014-10-16 14:44:35 +02:00
Nikita Popov cf5920e8aa Fix procedural finfo calls in methods 
getThis() will return the $this of the calling method.
 2014-10-16 14:24:23 +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 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 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
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
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 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 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
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 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