]> granicus.if.org Git - php/log
php
9 years agorevised bug53156.phpt
Christoph M. Becker [Mon, 20 Jul 2015 01:05:22 +0000 (03:05 +0200)]
revised bug53156.phpt

9 years agoFix #53156: imagerectangle problem with point ordering
Christoph M. Becker [Mon, 20 Jul 2015 00:11:18 +0000 (02:11 +0200)]
Fix #53156: imagerectangle problem with point ordering

Contrary to imagefilledrectangle(), imagerectangle() has the documented
limitation that the given points have to be the upper left and the lower right
corner, respectively. However, libgd already caters to upper right / lower left
pairs, and not catering to the other two combinations seems to be an oversight.

9 years agoAdded basic test for imagewebp() and imagecreatefromwebp()
Christoph M. Becker [Sun, 19 Jul 2015 21:03:02 +0000 (23:03 +0200)]
Added basic test for imagewebp() and imagecreatefromwebp()

9 years agoupdated NEWS
Christoph M. Becker [Sun, 19 Jul 2015 20:39:18 +0000 (22:39 +0200)]
updated NEWS

9 years agoFix #70102: imagecreatefromwebm() shifts colors
Christoph M. Becker [Sun, 19 Jul 2015 20:21:56 +0000 (22:21 +0200)]
Fix #70102: imagecreatefromwebm() shifts colors

libgd internally uses ARGB format, so we have to decode to ARGB instead of
RGBA.

9 years agofixed Fix #66590, which may segfault
Christoph M. Becker [Sun, 19 Jul 2015 19:51:35 +0000 (21:51 +0200)]
fixed Fix #66590, which may segfault

9 years agoupdated NEWS
Christoph M. Becker [Sun, 19 Jul 2015 15:43:44 +0000 (17:43 +0200)]
updated NEWS

9 years agoFix #66590: imagewebp() doesn't pad to even length
Christoph M. Becker [Sun, 19 Jul 2015 15:32:53 +0000 (17:32 +0200)]
Fix #66590: imagewebp() doesn't pad to even length

The code in the bundled libgd uses libvpx and writes the riff manually. The
code generates the correct even size, but neglects the padding. It's possible
older versions of libwebp would decode this, but libwebp 0.4.0 does not.

Let's apply the patch supplied by one of the WebP developers.

9 years agoupdated NEWS
Christoph M. Becker [Sat, 18 Jul 2015 20:50:11 +0000 (22:50 +0200)]
updated NEWS

9 years agoFix #70096: Repeated iptcembed() adds superfluous FF bytes
Christoph M. Becker [Sat, 18 Jul 2015 20:48:54 +0000 (22:48 +0200)]
Fix #70096: Repeated iptcembed() adds superfluous FF bytes

When there is already an APP13 marker segment in the file, iptcembed() doesn't
skip the first byte (0xFF) of this segment, what leads to unnecessary and
potentially invalid duplication of this byte. This patch fixes this issue.

9 years agofixed PHPT that is always being skipped or otherwise would fail
Christoph M. Becker [Sat, 18 Jul 2015 19:33:20 +0000 (21:33 +0200)]
fixed PHPT that is always being skipped or otherwise would fail

9 years agoFix test; this should properly emit a fatal error, just as every other by-ref assignm...
Bob Weinand [Thu, 16 Jul 2015 07:29:43 +0000 (09:29 +0200)]
Fix test; this should properly emit a fatal error, just as every other by-ref assignment to an overloaded object

9 years agoBackport fix for bug #70083 to PHP-5.6
Bob Weinand [Wed, 15 Jul 2015 20:46:53 +0000 (22:46 +0200)]
Backport fix for bug #70083 to PHP-5.6

9 years agoFix #53840: Misleading extension entries in php.ini
Christoph M. Becker [Tue, 14 Jul 2015 08:09:29 +0000 (10:09 +0200)]
Fix #53840: Misleading extension entries in php.ini

As of PHP 5.3.0 the php_pspell.dll is not delivered anymore with the Windows
binaries, and according to bug #47464 that's highly unlike to change. So it's
appropriate to remove the respective extension entry from php.ini.

9 years agoupdated NEWS
Christoph M. Becker [Mon, 13 Jul 2015 20:29:10 +0000 (22:29 +0200)]
updated NEWS

9 years agoFix #66882: imagerotate by -90 degrees truncates image by 1px
Christoph M. Becker [Mon, 13 Jul 2015 20:14:13 +0000 (22:14 +0200)]
Fix #66882: imagerotate by -90 degrees truncates image by 1px

Contrary to the external libgd, the bundled libgd doesn't use optimized
rotation algorithms for negative square angles. We fix that now.

There are other improvements in gdImageRotateInterpolated() in the external
libgd. I'll leave them out for now, in the hope that we'll be able to rejoin
the two libraries rather soon.

9 years agoupdated NEWS
Christoph M. Becker [Mon, 13 Jul 2015 16:34:40 +0000 (18:34 +0200)]
updated NEWS

9 years agoFix #70064: imagescale(..., IMG_BICUBIC) leaks memory
Christoph M. Becker [Mon, 13 Jul 2015 16:30:33 +0000 (18:30 +0200)]
Fix #70064: imagescale(..., IMG_BICUBIC) leaks memory

A temporary image (tmp_im) is created with gdImageTrueColor() and freed with
gdFree() instead of gdImageDestroy(). Let's fix that.

9 years agoupdated NEWS
Christoph M. Becker [Mon, 13 Jul 2015 13:54:57 +0000 (15:54 +0200)]
updated NEWS

9 years agoFix #69024: imagescale segfault with palette based image
Christoph M. Becker [Mon, 13 Jul 2015 13:43:16 +0000 (15:43 +0200)]
Fix #69024: imagescale segfault with palette based image

imagescale(..., IMG_BICUBIC) is not supposed to work with palette images, so we
fix that by converting to true color if necessary. Basically the same fix has
already been applied to the external libgd[1].

[1] <https://github.com/libgd/libgd/commit/723ea520bed3b5854df87393c687323d3930edf3>

9 years agoupdated NEWS
Christoph M. Becker [Sun, 12 Jul 2015 23:41:46 +0000 (01:41 +0200)]
updated NEWS

9 years agoFix #53154: Zero-height rectangle has whiskers
Christoph M. Becker [Sun, 12 Jul 2015 23:29:01 +0000 (01:29 +0200)]
Fix #53154: Zero-height rectangle has whiskers

To avoid drawing the corner pixels twice, gdImageRectangle() draws the vertical
lines 2 points shorter than the actual side of the rectangle. However, this
causes "whiskers" for rectangles with height 0. This patch fixes this issue and
at the same time optimizes the algorithm by drawing only a single line for zero
height and zero width rectangles.

9 years agoupdated NEWS
Christoph M. Becker [Sun, 12 Jul 2015 21:13:13 +0000 (23:13 +0200)]
updated NEWS

9 years agoFix #67447: imagecrop() adds a black line when cropping
Christoph M. Becker [Sun, 28 Jun 2015 23:36:39 +0000 (01:36 +0200)]
Fix #67447: imagecrop() adds a black line when cropping

A simple one-off error: imagecrop)() copied only width-1 and height-1 pixels.

9 years agoupdated NEWS
Christoph M. Becker [Sun, 12 Jul 2015 14:38:23 +0000 (16:38 +0200)]
updated NEWS

9 years agoFix #68714: copy 'n paste error
Christoph M. Becker [Sun, 12 Jul 2015 14:26:16 +0000 (16:26 +0200)]
Fix #68714: copy 'n paste error

Actually, this is not really a bug fix, but rather a simplification and
optimization in the same vein as has been done with the external libgd, but
going a small step further and joining both for loops.

9 years agoAdded XFAIL test for bug #53640
Christoph M. Becker [Sat, 11 Jul 2015 22:10:56 +0000 (00:10 +0200)]
Added XFAIL test for bug #53640

9 years agoupdated NEWS
Christoph M. Becker [Sat, 11 Jul 2015 18:58:50 +0000 (20:58 +0200)]
updated NEWS

9 years agoFix #66339: PHP segfaults in imagexbm
Christoph M. Becker [Sat, 11 Jul 2015 18:50:54 +0000 (20:50 +0200)]
Fix #66339: PHP segfaults in imagexbm

The file parameter of the XBM image ZPP is not properly taken into account. If
it is NULL that would result in a segfault, because gdImageXbmCtx() is not
prepared to take a NULL file_name. If it is not NULL the XBM data would be
written to STDOUT, because the stream is not initialized. This patch fixes both
issues.

9 years agoupdated NEWS
Christoph M. Becker [Sat, 11 Jul 2015 15:50:42 +0000 (17:50 +0200)]
updated NEWS

9 years agoFix #70047: gd_info() doesn't report WebP support
Christoph M. Becker [Sat, 11 Jul 2015 15:49:13 +0000 (17:49 +0200)]
Fix #70047: gd_info() doesn't report WebP support

Despite being documented, the array returned by gd_info() doesn't have a 'WebP
Support' key. This patch adds it.

9 years agoAdding tests for getprotobyname and getprotobynumber functions
Edgar R. Sandi [Thu, 9 Jul 2015 19:59:26 +0000 (16:59 -0300)]
Adding tests for getprotobyname and getprotobynumber functions

9 years agoadd missing NEWS entry
Ferenc Kovacs [Fri, 10 Jul 2015 15:25:44 +0000 (17:25 +0200)]
add missing NEWS entry

9 years agoadd missing NEWS entry
Ferenc Kovacs [Fri, 10 Jul 2015 00:30:29 +0000 (02:30 +0200)]
add missing NEWS entry

9 years agomove the use-after-free fixes to 5.6.11
Ferenc Kovacs [Thu, 9 Jul 2015 18:01:37 +0000 (20:01 +0200)]
move the use-after-free fixes to 5.6.11

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
Julien Pauli [Wed, 8 Jul 2015 15:00:29 +0000 (17:00 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.5.27 release

Conflicts:
main/php_version.h

9 years ago5.5.27 release
Julien Pauli [Wed, 8 Jul 2015 14:59:44 +0000 (16:59 +0200)]
5.5.27 release

9 years agoRevert "Fixed invalid read"
Xinchen Hui [Wed, 8 Jul 2015 14:34:27 +0000 (22:34 +0800)]
Revert "Fixed invalid read"

I must be confused while switching from master to 5.6

This reverts commit 94957a7091d2d87d3b75c8395a3a11a4fbecaea1.

9 years agoFixed invalid read
Xinchen Hui [Wed, 8 Jul 2015 11:06:49 +0000 (19:06 +0800)]
Fixed invalid read

9 years agoFixed bug #70012 (Exception lost with nested finally block)
Xinchen Hui [Wed, 8 Jul 2015 09:14:19 +0000 (17:14 +0800)]
Fixed bug #70012 (Exception lost with nested finally block)

9 years agofixed typo in test for bug #66985
Christoph M. Becker [Tue, 7 Jul 2015 21:35:28 +0000 (23:35 +0200)]
fixed typo in test for bug #66985

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Tue, 7 Jul 2015 17:12:51 +0000 (10:12 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Better fix for bug #69958
  update news
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file
  Better fix for bug #69958
  Better fix for bug #69958
  update news
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file

Conflicts:
ext/phar/phar_object.c

9 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Tue, 7 Jul 2015 17:09:34 +0000 (10:09 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Better fix for bug #69958
  update news
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file

Conflicts:
ext/mysqlnd/mysqlnd.c

9 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Stanislav Malyshev [Tue, 7 Jul 2015 17:08:37 +0000 (10:08 -0700)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  add missing second argument for ucfirst to the proto

9 years agofix C89 compat
Anatol Belski [Tue, 7 Jul 2015 16:39:33 +0000 (18:39 +0200)]
fix C89 compat

9 years agoBetter fix for bug #69958
Stanislav Malyshev [Tue, 7 Jul 2015 05:58:28 +0000 (22:58 -0700)]
Better fix for bug #69958

9 years agoupdate news
Stanislav Malyshev [Tue, 7 Jul 2015 04:19:42 +0000 (21:19 -0700)]
update news

9 years agoFix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
Stanislav Malyshev [Sun, 5 Jul 2015 07:00:53 +0000 (00:00 -0700)]
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)

9 years agoFix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
Stanislav Malyshev [Sun, 5 Jul 2015 06:47:48 +0000 (23:47 -0700)]
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath

9 years agoFix bug #69958 - Segfault in Phar::convertToData on invalid file
Stanislav Malyshev [Sun, 5 Jul 2015 04:01:50 +0000 (21:01 -0700)]
Fix bug #69958 - Segfault in Phar::convertToData on invalid file

9 years agoFix test related to c22da81
Julien Pauli [Tue, 7 Jul 2015 14:01:44 +0000 (16:01 +0200)]
Fix test related to c22da81

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
Ferenc Kovacs [Tue, 7 Jul 2015 13:49:44 +0000 (15:49 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  add missing second argument for ucfirst to the proto

9 years agoMerge branch 'PHP-5.4' into PHP-5.5
Ferenc Kovacs [Tue, 7 Jul 2015 13:49:16 +0000 (15:49 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add missing second argument for ucfirst to the proto

9 years agoadd missing second argument for ucfirst to the proto
Ferenc Kovacs [Tue, 7 Jul 2015 13:48:55 +0000 (15:48 +0200)]
add missing second argument for ucfirst to the proto

9 years agoFixed bug #69972 (Use-after-free vulnerability in sqlite3SafetyCheckSickOrOk())
Xinchen Hui [Tue, 7 Jul 2015 13:37:35 +0000 (21:37 +0800)]
Fixed bug #69972 (Use-after-free vulnerability in sqlite3SafetyCheckSickOrOk())

9 years agoFixed bug #69970 (Use-after-free vulnerability in spl_recursive_it_move_forward_ex())
Xinchen Hui [Tue, 7 Jul 2015 13:25:28 +0000 (21:25 +0800)]
Fixed bug #69970 (Use-after-free vulnerability in spl_recursive_it_move_forward_ex())

9 years agoFixed double ZEND_TICKS opcode generation for declare()
Julien Pauli [Mon, 6 Jul 2015 13:46:48 +0000 (15:46 +0200)]
Fixed double ZEND_TICKS opcode generation for declare()

9 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Tue, 7 Jul 2015 07:01:42 +0000 (00:01 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Better fix for bug #69958

9 years agoBetter fix for bug #69958
Stanislav Malyshev [Tue, 7 Jul 2015 05:58:28 +0000 (22:58 -0700)]
Better fix for bug #69958

9 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Tue, 7 Jul 2015 06:03:05 +0000 (23:03 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Better fix for bug #69958

9 years agoBetter fix for bug #69958
Stanislav Malyshev [Tue, 7 Jul 2015 05:58:28 +0000 (22:58 -0700)]
Better fix for bug #69958

9 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Tue, 7 Jul 2015 04:53:02 +0000 (21:53 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update news

9 years agoupdate news
Stanislav Malyshev [Tue, 7 Jul 2015 04:19:42 +0000 (21:19 -0700)]
update news

9 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Tue, 7 Jul 2015 04:52:49 +0000 (21:52 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file

Conflicts:
ext/mysqlnd/mysqlnd.c

9 years agoFix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
Stanislav Malyshev [Sun, 5 Jul 2015 07:00:53 +0000 (00:00 -0700)]
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)

9 years agoAttempt at falling back on ldap_find_control for Mac OS
Côme Bernigaud [Mon, 6 Jul 2015 12:54:04 +0000 (14:54 +0200)]
Attempt at falling back on ldap_find_control for Mac OS

9 years agoUpdated README, added test to create LDAP base if missing and ease tests
Côme Bernigaud [Mon, 6 Jul 2015 12:26:49 +0000 (14:26 +0200)]
Updated README, added test to create LDAP base if missing and ease tests

9 years agoCleaned white spaces in PHP_INI definition of phar
Dominic [Fri, 19 Jun 2015 10:31:03 +0000 (12:31 +0200)]
Cleaned white spaces in PHP_INI definition of phar

Removes unnecessary white spaces.

9 years agoMerge branch 'pull-request/1324' into PHP-5.6
Stanislav Malyshev [Sun, 5 Jul 2015 08:01:00 +0000 (01:01 -0700)]
Merge branch 'pull-request/1324' into PHP-5.6

* pull-request/1324:
  fix typo, see #68476

9 years agoFix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
Stanislav Malyshev [Sun, 5 Jul 2015 06:47:48 +0000 (23:47 -0700)]
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath

9 years agoFix bug #69958 - Segfault in Phar::convertToData on invalid file
Stanislav Malyshev [Sun, 5 Jul 2015 04:01:50 +0000 (21:01 -0700)]
Fix bug #69958 - Segfault in Phar::convertToData on invalid file

9 years agofix backport mistake
Anatol Belski [Fri, 3 Jul 2015 14:21:02 +0000 (16:21 +0200)]
fix backport mistake

in 5.6 it has to be explicitly copied to avoid double free

9 years agofixed fix #69975 wrt. ODBCVER < 0x0300
Christoph M. Becker [Fri, 3 Jul 2015 11:30:39 +0000 (13:30 +0200)]
fixed fix #69975 wrt. ODBCVER < 0x0300

9 years agobackport c01943bffc8b719e552d307f522820d50f783a4c into 5.6
Anatol Belski [Fri, 3 Jul 2015 09:16:02 +0000 (11:16 +0200)]
backport c01943bffc8b719e552d307f522820d50f783a4c into 5.6

9 years agoAdded more tests to improve function coverage
Edgar R. Sandi [Tue, 30 Jun 2015 01:02:19 +0000 (22:02 -0300)]
Added more tests to improve function coverage

9 years agoupdated NEWS
Christoph M. Becker [Thu, 2 Jul 2015 22:23:44 +0000 (00:23 +0200)]
updated NEWS

9 years agoFix #69975: PHP segfaults when accessing nvarchar(max) defined columns
Christoph M. Becker [Thu, 2 Jul 2015 22:04:50 +0000 (00:04 +0200)]
Fix #69975: PHP segfaults when accessing nvarchar(max) defined columns

The SQL Server Native Client 11.0 and maybe other ODBC drivers report
NVARCHAR(MAX) columns as SQL_WVARCHAR with size 0. This causes too small a
buffer to be emalloc'd, likely causing a segfault in the following. As we don't
know the real size of the column data, we treat such colums as
SQL_WLONGVARCHAR.

The related bug #67437 suggests that some drivers report a size of ~4GB. It is
not certain that this is really the case (there might be some integer overflow
involved, and anyway, there has been no feedback), so we do not cater for this
now. However, it would not be hard to treat all sizes above a certain threshold
in a similar way, i.e. as SQL_WLONGVARCHAR.

9 years agokeep LDAP_DEPRECATED in config.w32
Anatol Belski [Mon, 29 Jun 2015 08:12:36 +0000 (10:12 +0200)]
keep LDAP_DEPRECATED in config.w32

9 years agoImproved code coverage of explode function
Edgar R. Sandi [Mon, 29 Jun 2015 20:34:57 +0000 (17:34 -0300)]
Improved code coverage of explode function

9 years agoAdded basic and error tests for hex2bin function
Edgar R. Sandi [Mon, 29 Jun 2015 17:33:21 +0000 (14:33 -0300)]
Added basic and error tests for hex2bin function

9 years agoadding several other testing scenarios of code without coverage in stripcslashes...
Edgar R. Sandi [Mon, 29 Jun 2015 13:05:27 +0000 (10:05 -0300)]
adding several other testing scenarios of code without coverage in stripcslashes function

9 years agoadding another testing scenario without coverage in setlocale function
Edgar R. Sandi [Mon, 29 Jun 2015 12:50:27 +0000 (09:50 -0300)]
adding another testing scenario without coverage in setlocale function

9 years agoOn Windows PHP may be restarted with different set of DSO extensions without SHM...
Dmitry Stogov [Mon, 29 Jun 2015 14:45:56 +0000 (17:45 +0300)]
On Windows PHP may be restarted with different set of DSO extensions without SHM reset.
This may make optimisation for entities from DSO extensions inconsistent.

9 years agoMerge PR about LDAP cleaning by removing deprecated calls
Côme Bernigaud [Mon, 29 Jun 2015 07:31:37 +0000 (09:31 +0200)]
Merge PR about LDAP cleaning by removing deprecated calls

Merge branch 'pull-request/1357' into PHP-5.6

* pull-request/1357:
  Putting back deprecated symbols for ldap_sort
  Removed deprecated function calls from ldap module
  Removed ifdefs of LDAP_API_FEATURE_X_OPENLDAP, fixed a warning

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Mon, 29 Jun 2015 07:30:55 +0000 (00:30 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Move strlen() check to php_mail_detect_multiple_crlf()
  Fixed Bug #69874 : Can't set empty additional_headers for mail()

9 years agoPutting back deprecated symbols for ldap_sort
Côme Bernigaud [Mon, 29 Jun 2015 07:07:49 +0000 (09:07 +0200)]
Putting back deprecated symbols for ldap_sort

9 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Mon, 29 Jun 2015 03:23:00 +0000 (20:23 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Move strlen() check to php_mail_detect_multiple_crlf()
  Fixed Bug #69874 : Can't set empty additional_headers for mail()

9 years agoMerge branch 'pull-request/1350' into PHP-5.4
Stanislav Malyshev [Mon, 29 Jun 2015 01:53:19 +0000 (18:53 -0700)]
Merge branch 'pull-request/1350' into PHP-5.4

* pull-request/1350:
  Move strlen() check to php_mail_detect_multiple_crlf()
  Fixed Bug #69874 : Can't set empty additional_headers for mail()

9 years agoupdated NEWS
Christoph M. Becker [Sat, 27 Jun 2015 18:03:38 +0000 (20:03 +0200)]
updated NEWS

9 years agoFixed #69655: php -S changes MKCALENDAR request method to MKCOL
Christoph M. Becker [Sat, 27 Jun 2015 17:47:32 +0000 (19:47 +0200)]
Fixed #69655: php -S changes MKCALENDAR request method to MKCOL

The parsing of the request method in the CLI server has been faulty, so that
several unsupported methods have been recognized as other methods.

9 years agoadded skip condition for powershell requirement of test
Christoph M. Becker [Sat, 27 Jun 2015 13:02:52 +0000 (15:02 +0200)]
added skip condition for powershell requirement of test

9 years agoupdated NEWS
Christoph M. Becker [Sat, 27 Jun 2015 12:32:34 +0000 (14:32 +0200)]
updated NEWS

9 years agoFix #64878: 304 responses return Content-Type header
Christoph M. Becker [Mon, 18 May 2015 19:28:22 +0000 (21:28 +0200)]
Fix #64878: 304 responses return Content-Type header

According to RFC 7232 304 responses should not send a Content-Type header,
so the CLI server should comply.

9 years agoadded regression test for bug #69679
Christoph M. Becker [Fri, 26 Jun 2015 23:08:56 +0000 (01:08 +0200)]
added regression test for bug #69679

DOMDocument::loadHTML refuses to accept NULL bytes.

9 years agoslightly revised bug69462.phpt
Christoph M. Becker [Fri, 26 Jun 2015 21:20:22 +0000 (23:20 +0200)]
slightly revised bug69462.phpt

9 years agoTest for bug #69462
Tomasz Sawicki [Thu, 25 Jun 2015 16:32:01 +0000 (18:32 +0200)]
Test for bug #69462

Test scenario for already fixed bug #69462 with segmentation fault when
SoapVar XML node name was null.

9 years agoFixed #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with...
Tjerk Meesters [Thu, 25 Jun 2015 21:31:54 +0000 (05:31 +0800)]
Fixed #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs

Squashed commit of the following:

commit a64c1d9bc4c129fd946a478bdcb55101e42157b7
Author: Tomasz Sawicki <falundir@gmail.com>
Date:   Wed Jun 24 08:49:37 2015 +0200

    Fix #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs

    The "key values mismatch" error is triggered in openssl_pkcs12_read by
    PKCS12_parse, because it uses X509_check_private_key to separate main
    certificate (which corresponds to private key) from extra certificates.
    Extra certificates usually comes first (p12 contents are reversed as
    stack) and X509_check_private_key triggers X509_R_KEY_VALUES_MISMATCH
    error.
    The fix pops "key values mismatch" error from OpenSSL error stack for
    each extra certificate if there are any.

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
Julien Pauli [Thu, 25 Jun 2015 17:13:20 +0000 (19:13 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix unknown size of void error

9 years agofix unknown size of void error
Anatol Belski [Wed, 17 Jun 2015 21:43:13 +0000 (23:43 +0200)]
fix unknown size of void error

9 years agobackport missing rev bfdc9e280515c1639dfe1d81ce6fc225d2cf1bc9
Anatol Belski [Thu, 25 Jun 2015 09:34:04 +0000 (11:34 +0200)]
backport missing rev bfdc9e280515c1639dfe1d81ce6fc225d2cf1bc9