Remi Collet
f2d5b2b6c6
Fixed Bug #66893i imagescale ignore method argument
...
We also have our goto fail; bug.
Upstream fix for libgd
5b42b1178c
2014-03-12 15:35:42 +01:00
Nikita Popov
06bbb657ad
Fix hash_pbkdf2() with missing $length argument
...
Also change the type of some string length variables to ensure
that the zpp call works correctly on platforms where sizeof(int)
!= sizeof(long).
2014-03-12 14:16:18 +01:00
Remi Collet
dada2f550f
Fixed Bug #66890 imagescale segfault
...
zend_parse_parameters "l" expect long, not int
2014-03-12 13:44:58 +01:00
Adam Harvey
f8252aa537
Fix compile error with theoretically supported versions of libcurl < 7.12.3.
2014-03-11 11:04:26 -07:00
Tjerk Meesters
cb5178a450
Merge branch 'PHP-5.4' into PHP-5.5
2014-03-11 19:14:43 +08:00
Tjerk Meesters
ddd7ed9b24
Removed bogus loops
2014-03-11 19:08:18 +08:00
Anatol Belski
72050af855
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
restored the old code in 5.4/5 related to bug #66872
2014-03-11 11:51:35 +01:00
Anatol Belski
1a624e27a6
restored the old code in 5.4/5 related to bug #66872
...
The crash is reproducable in 5.6+ only, so 5.4 and 5.5 are fine
with the old code.
2014-03-11 11:50:14 +01:00
Anatol Belski
73b3f58bcd
updated libsqlite to 3.8.3.1 in 5.5 branch, too
2014-03-10 17:49:35 +01:00
Pierre Joye
8391277fb8
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
...
# By Anatol Belski
# Via Anatol Belski
* 'PHP-5.4' of git.php.net:php-src:
updated libmagic.patch
2014-03-10 16:31:09 +01:00
Pierre Joye
a92240e209
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
# By Anatol Belski (1) and others
# Via Anatol Belski
* 'PHP-5.5' of git.php.net:php-src:
updated libmagic.patch
Fix indentation
Do not remove *.1, it's not generated by make but configure
2014-03-10 16:30:05 +01:00
Anatol Belski
c17fd65165
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch
2014-03-10 14:13:15 +01:00
Anatol Belski
b9d494a33b
updated libmagic.patch
2014-03-10 14:12:20 +01:00
Pierre Joye
d2e42d5372
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix #66872 , invalid argument crashes gmp_testbit
fix #66872 , invalid argument crashes gmp_testbit
add vc12 (2013)
Conflicts:
win32/build/confutils.js
2014-03-10 12:10:57 +01:00
Pierre Joye
af41914e15
fix #66872 , invalid argument crashes gmp_testbit
2014-03-10 12:06:40 +01:00
Andrey Hristov
3a76cb2d95
Fix indentation
2014-03-10 12:52:56 +02:00
Pierre Joye
8e3c2015dc
- fix #66869 , Invalid 2nd argument crashes imageaffinematrixget
2014-03-09 21:12:19 +01:00
Tjerk Meesters
972935cd95
Fixed null termination
2014-03-07 19:23:46 +08:00
datibbaw
3c673fed34
Add fread(length) method
...
Fixed off-by-one write bug
Added test
2014-03-07 18:50:33 +08:00
Nikita Popov
ecf7570072
Merge branch 'PHP-5.4' into PHP-5.5
2014-03-06 23:12:41 +01:00
Dmitry Panin
e2fc6b52f0
Fix HTML entity table generation
2014-03-06 23:10:31 +01:00
Remi Collet
7d5c11c235
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Set default Digest Message to use SHA1 instead of MD5 in openssl tests as MD5 signature are now rejected by newer openssl Version.
2014-03-06 10:16:16 +01:00
Remi Collet
721b9a7c8d
Set default Digest Message to use SHA1 instead of MD5 in openssl tests
...
as MD5 signature are now rejected by newer openssl Version.
Noticed in RHEL-7 and Fedora 21 build.
2014-03-06 10:14:08 +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
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
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
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
Tjerk Meesters
bbd0781b39
Merge branch 'PHP-5.4' into PHP-5.5
2014-03-03 05:56:22 +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
Anatol Belski
36c445970e
don't compare constants on run time
2014-02-28 19:38:32 +01: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
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
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
Remi Collet
82e92c99a6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
test for bug #66762
Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed
2014-02-27 08:49:33 +01:00
Remi Collet
816a5d2072
test for bug #66762
2014-02-27 08:48:01 +01:00
Remi Collet
9137acc7ec
Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed
...
Each new mysqli_stmt now increase the refcount of the link object.
So the link is really destroy after all statements.
Only implemented with libmysqlclient, as mysqlnd already implement
this internally.
So, libmysqlclient and mysqlnd have the same behavior.
2014-02-27 08:45:16 +01:00
Ferenc Kovacs
fd20278fa5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix tests broken by 633f898f15
2014-02-27 02:32:07 +01:00
Ferenc Kovacs
bd961f3e87
fix tests broken by 633f898f15
2014-02-27 02:31:42 +01:00
Christopher Jones
a59ec5d1b0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Reduce test noise on cross Oracle client <-> server version tests. This fix is already in PHP 5.6+
2014-02-24 17:02:16 -08:00
Christopher Jones
ee7671afb5
Reduce test noise on cross Oracle client <-> server version tests.
...
This fix is already in PHP 5.6+
2014-02-24 17:01:30 -08:00
Christopher Jones
593505f266
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Reduce test noise in cross Oracle client <-> server version testing. This change is already in PHP 5.6+
2014-02-24 16:35:08 -08:00
Christopher Jones
8cdefd3d10
Reduce test noise in cross Oracle client <-> server version testing.
...
This change is already in PHP 5.6+
2014-02-24 16:33:41 -08:00
Johannes Schlüter
2198bbce86
Merge branch 'PHP-5.4' into PHP-5.5
2014-02-23 14:56:32 +01:00
Johannes Schlüter
756ee95605
We can't dereference dbh if it is NULL
2014-02-23 14:18:24 +01:00
Dmitry Stogov
851f362882
Added information about interned strings usage
2014-02-21 12:43:42 +04:00
Dmitry Stogov
f06b3432c8
Updated opcache version
2014-02-21 12:04:42 +04:00