php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 17:38:14 +02:00
Code Issues Packages Projects Releases Wiki Activity
76,044 Commits 549 Branches 1,485 Tags
a04c5536bb2aa06a773a753da3eba5fd5010c5cd
Commit Graph

32644 Commits

Author SHA1 Message Date
Daniel Lowrey 5ac2e5f850 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #41631: Observe socket read timeouts in SSL streams
 2014-08-07 11:51:42 -04:00
Daniel Lowrey 6569db8808 Bug #41631: Observe socket read timeouts in SSL streams 2014-08-07 11:47:42 -04:00
Derick Rethans 0753c22e76 Merge branch 'PHP-5.4' into PHP-5.5 2014-08-07 10:22:10 +01:00
Derick Rethans 7df4087b98 - Updated to version 2014.6 (2014f) 2014-08-07 10:22:09 +01:00
Andrey Hristov ce5efa7adc Merge branch 'PHP-5.4' into PHP-5.5 2014-08-06 15:28:06 +03:00
Andrey Hristov 41e1ccefd5 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
	configure.in
	main/php_version.h
 2014-08-06 15:27:56 +03:00
Andrey Hristov d72b943262 Add EXPECTF 2014-08-06 15:27:29 +03:00
Andrey Hristov 9444bc7997 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2014-08-06 14:52:55 +03:00
Andrey Hristov 547451796c Fix handling of multi-result sets with PS...used to clean not only 
the result set but the whole PS.
 2014-08-06 14:52:12 +03:00
Michael Wallner e4ff7f2ee3 Fixed Bug #67724 
(chained zlib filters silently fail with large amounts of data)

Use the same buffer size zlib uses internally to avoid
Z_DATA_ERROR on massively compressed data
 2014-08-05 15:44:43 +02:00
Remi Collet cf4753691d Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference 
Upstream https://bitbucket.org/libgd/gd-libgd/commits/463c3bd09bfe8e924e19acad7a2a6af16953a704

Notice: this fix don't manage monochrome/monovisual values
but just fix the security issue CVE-2014-2497
failing when trying to load such an image
 2014-08-04 10:42:39 +02:00
Anatol Belski ae74549239 backport the fix for bug #67739 2014-08-04 09:57:08 +02:00
Stanislav Malyshev 61ec9b5b0f add test 2014-08-04 00:08:08 -07:00
Stanislav Malyshev eeaec70758 Fix bug #67705 (extensive backtracking in rule regular expression) 2014-08-04 00:05:40 -07:00
Andrey Hristov 95febf26c6 Fix wrong lenght size 2014-07-31 21:27:51 +03:00
Peter Cowburn c2f2d5c8fc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #51096 - Remove unnecessary ? for first/last day of

Conflicts:
	ext/date/lib/parse_date.c
 2014-07-31 14:33:55 +01:00
Peter Cowburn 358aedc454 Bug #51096 - Remove unnecessary ? for first/last day of 2014-07-31 14:21:38 +01:00
Rasmus Lerdorf 579c9066a0 Merge commit '8b9719d' into PHP-5.5 
* commit '8b9719d':
  We need to turn off any strict mode here for this warning to show up
 2014-07-30 12:23:24 -04:00
Rasmus Lerdorf 8b9719d8b9 We need to turn off any strict mode here for this warning to show up 2014-07-30 12:22:48 -04:00
Tjerk Meesters e9967292c3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Updated NEWS for #67693
  Fixed bug #67693 - incorrect push to the empty array
 2014-07-30 18:17:13 +08:00
Tjerk Meesters da3add26cf Fixed bug #67693 - incorrect push to the empty array 2014-07-30 18:15:14 +08:00
Dmitry Stogov aa3ddda8e5 Fixed usage after free 2014-07-30 10:39:25 +04:00
Keyur Govande ab4c4c3970 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Undo inadvertent commit of php_version
  Corrected patch for bug #60616
 2014-07-30 02:34:46 +00:00
Keyur Govande 65364fe7d0 Corrected patch for bug #60616 
For unixODBC, use ODBC version as defined by it (as of v2.2.14 it is 3.5).
This allows us to use newer features like SQL_DESC_OCTET_LENGTH (which
returns the number of bytes required to store the data). This fixes the issue
in #60616. If the newer version is not available, over-allocate to accomodate
4-byte Unicode characters for CHAR and VARCHAR datatypes (and their Wide
counterparts).
version.
Fixed a couple of failing tests.
 2014-07-30 02:28:31 +00:00
Keyur Govande 90f99d47c0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields)
 2014-07-28 23:16:20 +00:00
Keyur Govande 00546bc9b7 Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields) 
The ODBC extension did not support WVARCHAR. WVARCHAR ends up being handled by
the default handler where vallen is set by the driver to the actual bytes
needed for the field. If it is larger than default-lrl then the output is
corrupted (reading past the buffer) because the return functions don't expect
that to happen. The patch add support to handle WVARCHAR just like a regular
VARCHAR.
 2014-07-28 23:15:23 +00:00
Stanislav Malyshev 531be9662f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix missing type checks in various functions
 2014-07-28 00:34:27 -07:00
Stanislav Malyshev b4a4db467b Fix missing type checks in various functions 2014-07-27 02:42:49 -07:00
Xinchen Hui 51c38a0997 Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting) 2014-07-24 22:54:14 -07:00
Xinchen Hui 61e0f8599d Fixed Bug #67538 (SPL Iterators use-after-free) 2014-07-24 22:53:46 -07:00
Johannes Schlüter 432bd117a9 Merge branch 'PHP-5.4' into PHP-5.5 2014-07-24 18:00:06 +02:00
Dmitry Saprykin d491b2f916 Fix bug #67496 Save command history when exiting interactive shell with control-c 2014-07-24 17:58:39 +02:00
Johannes Schlüter ffc1d25b37 Merge branch 'PHP-5.4' into PHP-5.5 2014-07-24 16:56:05 +02:00
Johannes Schlüter 71d3a69425 Fix bug #55496 Interactive mode doesn't force a newline before the prompt 2014-07-24 16:53:51 +02:00
Yasuo Ohgaki f83a6c33b4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #66827 Session raises E_NOTICE when session name variable is array
 2014-07-19 09:53:04 +09:00
Yasuo Ohgaki e946de29d2 Fixed bug #66827 Session raises E_NOTICE when session name variable is array 2014-07-19 09:52:31 +09:00
Lior Kaplan 3e1b749f5e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Enable build without atoll (e.g old AIX flavours)
 2014-07-17 23:04:23 +03:00
Lior Kaplan 2dff153b23 Enable build without atoll (e.g old AIX flavours) 2014-07-17 22:58:36 +03:00
Rasmus Lerdorf 275e41cb12 Test output relies on expose_php being on 2014-07-14 07:21:11 -07:00
Rasmus Lerdorf 050ef52549 1.2 is a problematic float to print out 
Lower the default display precision for this test
 2014-07-14 07:21:10 -07:00
Tjerk Meesters 8757e2cab8 Merge branch 'PHP-5.4' into PHP-5.5 2014-07-12 11:08:50 +08:00
Tjerk Meesters 4fc0d46ae7 Fix for bug #34407 - ucwords and title case 
Added support for ranges like trim() has
 2014-07-12 10:44:11 +08:00
Stanislav Malyshev cd1130751d fix unstable test 2014-07-08 15:04:09 -07:00
Stanislav Malyshev 64e4261c9b fix unstable test 2014-07-08 14:13:46 -07:00
Stanislav Malyshev 5312c39cfb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #67587: Redirection loop on nginx with FPM
 2014-07-08 12:54:20 -07:00
Christian Weiske 0bf50a8302 Fix bug #67587: Redirection loop on nginx with FPM 
Redirection will work correctly as long as PATH_INFO is available,
e.g. via the following nginx configuration:

    set $path_info $fastcgi_path_info;
    fastcgi_param PATH_INFO $path_info;
 2014-07-08 12:53:45 -07:00
Anatol Belski 51f79846bf Backported the patch from bug #67407 into 5.5+ 2014-07-08 09:54:36 +02:00
Anatol Belski 03214a2aef Backported the patch from bug #67407 into 5.4 2014-07-08 09:52:35 +02:00
Stanislav Malyshev 5516963633 create locales and re-add test 2014-07-07 10:34:43 -07:00
Stanislav Malyshev 0e1599afe0 rm test for now 2014-07-07 09:32:26 -07:00