php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-05 07:02:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
76,044 Commits 547 Branches 1,481 Tags
a04c5536bb2aa06a773a753da3eba5fd5010c5cd
Commit Graph

76044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Lowrey
a04c5536bb Update NEWS 2014-08-07 12:39:42 -04:00
Daniel Lowrey
378ffd3cdf Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update NEWS
 2014-08-07 12:38:04 -04:00
Daniel Lowrey
1ff30fd88c Update NEWS 2014-08-07 12:37:50 -04:00
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
Anatol Belski
58088c24eb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  wrap int8_t and int16_t with #ifdef to avoid possible clashes
 2014-08-07 15:21:42 +02:00
Anatol Belski
7189039d65 wrap int8_t and int16_t with #ifdef to avoid possible clashes 2014-08-07 15:20:17 +02: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
637367fc73 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
Conflicts:
	NEWS
	configure.in
	main/php_version.h
 2014-08-06 17:02:17 +03: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
Julien Pauli
05baed522f 5.5.17 now 2014-08-06 10:20:31 +02:00
Stanislav Malyshev
1e9abea139 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.4.33-dev now

Conflicts:
	configure.in
	main/php_version.h
 2014-08-05 21:26:11 -07:00
Stanislav Malyshev
65cf73c931 5.4.33-dev now 2014-08-05 21:24:55 -07:00
Michael Wallner
442629f81d BFN 2014-08-05 15:47:52 +02:00
Michael Wallner
fa57c291bb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed Bug #67724
 2014-08-05 15:46:52 +02: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
0ab5854863 typo 2014-08-04 11:08:54 +02:00
Remi Collet
fa27974ec0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  typo
 2014-08-04 11:08:41 +02:00
Remi Collet
f59506cd27 typo 2014-08-04 11:08:30 +02:00
Remi Collet
1158563958 NEWS 2014-08-04 10:48:29 +02:00
Remi Collet
a45b8874fb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference
 2014-08-04 10:47:54 +02:00
Remi Collet
d3b5ed0787 NEWS 2014-08-04 10:46:53 +02:00
Remi Collet
cf4753691d Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference 
Upstream 463c3bd09b

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
e0c1fa30c4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  backport the fix for bug #67739
 2014-08-04 09:57:59 +02:00
Anatol Belski
ae74549239 backport the fix for bug #67739 2014-08-04 09:57:08 +02:00
Stanislav Malyshev
9b9aa4b811 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add test
 2014-08-04 00:08:17 -07:00
Stanislav Malyshev
61ec9b5b0f add test 2014-08-04 00:08:08 -07:00
Stanislav Malyshev
c9e114a451 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #67705 (extensive backtracking in rule regular expression)
 2014-08-04 00:06:22 -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
bff84d7c18 Merge branch 'pull-request/754' into PHP-5.4 2014-07-31 14:30:39 +01:00
Peter Cowburn
358aedc454 Bug #51096 - Remove unnecessary ? for first/last day of 2014-07-31 14:21:38 +01:00
Keyur Govande
b96224625c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update NEWS
 2014-07-30 18:39:59 +00:00
Keyur Govande
7b60430a8f Update NEWS 2014-07-30 18:39:23 +00:00
Keyur Govande
0a29e4731e Update NEWS 2014-07-30 18:33:19 +00:00
Michael Wallner
48cadf242d BFN 2014-07-30 20:13:17 +02:00
Michael Wallner
6ed9991a6f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #67715 (php-milter does not build and crashes randomly).
 2014-07-30 20:12:50 +02:00
Michael Wallner
12b2127b72 Fixed bug #67715 (php-milter does not build and crashes randomly). 2014-07-30 20:12:13 +02: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
52f4587e8a Updated NEWS for #67693 2014-07-30 18:17:36 +08: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
b3466f862f Updated NEWS for #67693 2014-07-30 18:16:56 +08:00
Tjerk Meesters
da3add26cf Fixed bug #67693 - incorrect push to the empty array 2014-07-30 18:15:14 +08:00