clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,463 Commits 491 Branches 1,363 Tags 838 MiB
6b804b96b8
Commit Graph

78463 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrey Hristov
6b804b96b8 Refactor the result set data structures. Move more to the buffered and unbuffered 
substructures. Add methods to these too. Preparing for pluggable interface for
returning data to the engine (zvals, c-style, something else)
 2014-03-05 16:22:23 +02:00
Remi Collet
1b922895fc NEWS 2014-03-05 10:45:50 +01:00
Remi Collet
cf89ff3d24 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fixed Bug #66815 imagecrop(): insufficient fix for NULL defer CVE-2013-7327
 2014-03-05 10:44:04 +01:00
Remi Collet
515c103a08 NEWS 2014-03-05 10:43:45 +01:00
Remi Collet
af09d8b96a Fixed Bug #66815 imagecrop(): insufficient fix for NULL defer CVE-2013-7327 
This amends commit 8f4a537, which aimed to correct NULL dereference because of
missing check of gdImageCreateTrueColor() / gdImageCreate() return value.  That
commit checks for negative crop rectangle width and height, but
gdImageCreate*() can also return NULL when width * height overflows.  Hence
NULL deref is still possible, as gdImageSaveAlpha() and gdImagePaletteCopy()
is called before dst == NULL check.

This moves NULL check to happen right after gdImageCreate*().  It also removes
width and height check before gdImageCreate*(), as the same check is done by
image create functions (with an extra warning).

From thoger redhat com
 2014-03-05 10:40:36 +01:00
Remi Collet
9a9add6b73 fix merge 2014-03-04 20:39:00 +01:00
Remi Collet
014b95a0a7 NEWS 2014-03-04 20:36:31 +01:00
Remi Collet
5d08cae346 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed Bug #66820 out-of-bounds memory access in fileinfo
 2014-03-04 20:36:08 +01:00
Remi Collet
c2a9f73c99 NEWS 2014-03-04 20:35:56 +01:00
Remi Collet
a33759fd27 Fixed Bug #66820 out-of-bounds memory access in fileinfo 
Upstream fix:
447558595a

Notice, test changed, with upstream agreement:
-define OFFSET_OOB(n, o, i)	((n) < (o) || (i) >= ((n) - (o)))
+define OFFSET_OOB(n, o, i)	((n) < (o) || (i) >  ((n) - (o)))
 2014-03-04 20:32:52 +01:00
Remi Collet
834b719cf5 fix merge 2014-03-04 13:46:21 +01:00
Remi Collet
bc0b6e02e4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Improves fix for memory leak, keep in sync with upstream.
 2014-03-04 13:43:42 +01:00
Remi Collet
731013ee8e Improves fix for memory leak, keep in sync with upstream. 
Previous fix:
http://git.php.net/?p=php-src.git;a=commitdiff;h=10eb0070700382f966bf260e44135e1f724a15d2

Upstream fix:
c0c0032b9e
 2014-03-04 13:41:37 +01:00
Remi Collet
f7e381eef6 Add notice about tsrm_virtual_cwd.h moved to zend_virtual_cwd.h 
as this introduce need for awfull hacks...
 2014-03-03 15:33:11 +01:00
Tjerk Meesters
fed56fbae8 Fixed NEWS for #60602 2014-03-03 05:59:07 +08:00
Tjerk Meesters
330ffe2e24 Merge branch 'PHP-5.5' into PHP-5.6 2014-03-03 05:58:03 +08:00
Tjerk Meesters
c34f26a938 Fixed news for #60602 2014-03-03 05:57:36 +08:00
Tjerk Meesters
bbd0781b39 Merge branch 'PHP-5.4' into PHP-5.5 2014-03-03 05:56:22 +08:00
Tjerk Meesters
1533f98afd Updated news for #60602 2014-03-03 05:54:09 +08:00
Tjerk Meesters
e73c05b75e proc_open(): separate environment values that aren't strings 
Added a test case
 2014-03-03 05:49:52 +08:00
Derick Rethans
574f230d3c Added DateTimeImmutable::createFromMutable. 2014-03-02 14:18:44 -05:00
Derick Rethans
b8d75cc464 Sort alphabetically 2014-03-02 14:15:30 -05:00
Derick Rethans
3eb8102348 Fixed NEWS. 2014-03-02 13:27:35 -05:00
Daniel Lowrey
c126c16479 Capture peer cert even if verify fails 
Previously the "capture_peer_cert" SSL context option only
captured the peer's certificate if the verification routine
succeeded.

By also capturing the on verify failure applications have the
ability to parse the cert and ask users whether they wish to
proceed given the information presented by the peer.
 2014-03-02 10:35:52 -07:00
Chris Wright
e8995c8cb0 Windows cert verify improvements + leak fixes 
- Clean up properly at all fail points in native Windows peer
  verification routine
- Bring certificate usages and chain flags into line with chromium
  implementation in windows environments
 2014-03-02 10:30:21 -07:00
Anatol Belski
9d4adf4fe1 turn off some false positives 2014-03-02 12:49:30 +01:00
Anatol Belski
cf90bd92bf support for static analyzers other than visual studio 2014-03-01 20:15:10 +01:00
Anatol Belski
0bbacd8678 fix wording 2014-03-01 13:28:02 +01:00
Anatol Belski
db9d911093 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-03-01 13:16:16 +01:00
Anatol Belski
7c60a09cae reveal more info on the configure options 2014-03-01 13:11:35 +01:00
Tjerk Meesters
6b6b2149af Updated news for #66535 and #66109 2014-03-01 12:27:36 +08:00
Tjerk Meesters
c9680697ec Updated news for #66535 and #66109 2014-03-01 12:27:22 +08:00
Tjerk Meesters
362b70a32c Updated NEWS for #66535 2014-03-01 08:47:32 +08:00
Anatol Belski
af545ead97 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  don't compare constants on run time
 2014-02-28 19:39:34 +01:00
Anatol Belski
36c445970e don't compare constants on run time 2014-02-28 19:38:32 +01:00
Tjerk Meesters
e424049840 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  substr_compare(): Allow zero length comparison
 2014-02-28 23:48:34 +08:00
datibbaw
2e459be237 substr_compare(): Allow zero length comparison 
Treat zero length comparison as always equal.
 2014-02-28 23:45:04 +08:00
Tjerk Meesters
43ac0ab673 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed test case title
  [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
 2014-02-28 22:31:16 +08:00
Tjerk Meesters
d022c8565d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed test case title
  [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
 2014-02-28 22:30:21 +08:00
Tjerk Meesters
eca13f7909 Fixed test case title 2014-02-28 22:27:32 +08:00
Tjerk Meesters
79b3c2a744 [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given 
A newline is added to the mail headers when mail.add_x_header is used and no other headers are passed to mail().

The scenario in which custom headers are used was already fixed in #48620, back in 2009.
 2014-02-28 22:22:07 +08:00
Tjerk Meesters
cbb2dc0788 Merge branch '5.5' into 5.6 
* 5.5:
  Fixed expected output of a few cURL test cases
  Allow NULL as value for CURLOPT_CUSTOMREQUEST option.
 2014-02-28 19:01:17 +08:00
Tjerk Meesters
9443fb999d Fixed expected output of a few cURL test cases 2014-02-28 18:59:06 +08:00
datibbaw
488e64dbe4 Allow NULL as value for CURLOPT_CUSTOMREQUEST option. 
Added test case.

Refactored the code to isolate the string handling. Fixed return values to use SUCCESS and FAILURE.

Removed unused error variable.

Indentation fix.
Removed the ugly goto.
 2014-02-28 18:27:22 +08:00
Anatol Belski
1cb4398ac1 primitive test fixes 2014-02-28 09:43:57 +01:00
Remi Collet
06feb15a16 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
 2014-02-28 08:12:26 +01:00
Remi Collet
5fc7382a57 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
 2014-02-28 08:12:16 +01:00
Remi Collet
b1df743b7a man page: long option name is --strip, not --stripped 2014-02-28 08:12:03 +01:00
Remi Collet
c73b0543f1 --global have be removed in 5.2 2014-02-28 08:10:01 +01:00
Anatol Belski
2c1385b7f5 remove pcntl leftover from the test code 2014-02-27 15:50:17 +01:00