]> granicus.if.org Git - php/log
php
8 years agoFix bug #72749: wddx_deserialize allows illegal memory access
Stanislav Malyshev [Thu, 4 Aug 2016 07:17:42 +0000 (00:17 -0700)]
Fix bug #72749: wddx_deserialize allows illegal memory access

(cherry picked from commit 659a21dc20f0b64dafd8cb16573059d3b45cce6b)

Conflicts:
ext/wddx/wddx.c

8 years agoFixed bug #72627: Memory Leakage In exif_process_IFD_in_TIFF
Stanislav Malyshev [Mon, 8 Aug 2016 07:49:34 +0000 (00:49 -0700)]
Fixed bug #72627: Memory Leakage In exif_process_IFD_in_TIFF

(cherry picked from commit 620b01337cc39f856ca68c34c35e154f5f0682fc)

Conflicts:
ext/exif/exif.c

8 years agofix tests
Anatol Belski [Tue, 16 Aug 2016 12:41:24 +0000 (14:41 +0200)]
fix tests

8 years agoFix bug#72697 - select_colors write out-of-bounds
Anatol Belski [Tue, 16 Aug 2016 12:37:39 +0000 (14:37 +0200)]
Fix bug#72697 - select_colors write out-of-bounds

(cherry picked from commit b6f13a5ef9d6280cf984826a5de012a32c396cd4)

Conflicts:
ext/gd/gd.c

8 years agoFix bug #72708 - php_snmp_parse_oid integer overflow in memory allocation
Stanislav Malyshev [Thu, 4 Aug 2016 05:37:57 +0000 (22:37 -0700)]
Fix bug #72708 - php_snmp_parse_oid integer overflow in memory allocation

(cherry picked from commit c3f6d6da100c6451a540680504de4105b8bed83c)

Conflicts:
ext/snmp/snmp.c
main/php_version.h

8 years agoFix bug #72730 - imagegammacorrect allows arbitrary write access
Stanislav Malyshev [Wed, 10 Aug 2016 07:14:58 +0000 (00:14 -0700)]
Fix bug #72730 - imagegammacorrect allows arbitrary write access

(cherry picked from commit 047fe0ed03093a496691d376fcf51a7e2f1d04b0)

Conflicts:
ext/gd/gd.c

8 years agoFix bug #72750: wddx_deserialize null dereference
Stanislav Malyshev [Sun, 7 Aug 2016 23:26:52 +0000 (16:26 -0700)]
Fix bug #72750: wddx_deserialize null dereference

(cherry picked from commit 6930a1d12c47aa1d2675837852910d177b0ceb11)

Conflicts:
ext/wddx/wddx.c

8 years agoFix bug #72771: ftps:// opendir wrapper is vulnerable to protocol downgrade attack
Anatol Belski [Tue, 16 Aug 2016 11:08:24 +0000 (13:08 +0200)]
Fix bug #72771: ftps:// opendir wrapper is vulnerable to protocol downgrade attack

(cherry picked from commit f9c2edb4dbc01a817989b70ca7726f177bb1a103)

Conflicts:
ext/standard/ftp_fopen_wrapper.c

8 years agofix tests
Anatol Belski [Tue, 16 Aug 2016 11:01:06 +0000 (13:01 +0200)]
fix tests

8 years agoadd missing skipif section
Anatol Belski [Tue, 16 Aug 2016 10:53:40 +0000 (12:53 +0200)]
add missing skipif section

8 years agoFix for bug #72790 and bug #72799
Stanislav Malyshev [Thu, 11 Aug 2016 06:43:56 +0000 (23:43 -0700)]
Fix for bug #72790 and bug #72799

(cherry picked from commit a14fdb9746262549bbbb96abb87338bacd147e1b)

Conflicts:
ext/wddx/wddx.c

8 years agoFix bug #72837 - integer overflow in bzdecompress caused heap corruption
Anatol Belski [Tue, 16 Aug 2016 10:34:25 +0000 (12:34 +0200)]
Fix bug #72837 - integer overflow in bzdecompress caused heap corruption

Conflicts:
ext/bz2/bz2.c

8 years agoFix bug #72742 - memory allocator fails to realloc small block to large one
Stanislav Malyshev [Mon, 15 Aug 2016 02:07:15 +0000 (19:07 -0700)]
Fix bug #72742 - memory allocator fails to realloc small block to large one

8 years agoUse size_t for path length
Stanislav Malyshev [Thu, 11 Aug 2016 06:46:58 +0000 (23:46 -0700)]
Use size_t for path length

8 years agoCheck for string overflow
Stanislav Malyshev [Thu, 11 Aug 2016 06:46:33 +0000 (23:46 -0700)]
Check for string overflow

8 years agoFix for bug #72782: mcrypt accepts only ints, so don't pass anything else
Stanislav Malyshev [Thu, 11 Aug 2016 05:33:18 +0000 (22:33 -0700)]
Fix for bug #72782: mcrypt accepts only ints, so don't pass anything else

8 years agoFix bug #72674 - check both curl_escape and curl_unescape
Stanislav Malyshev [Wed, 3 Aug 2016 07:58:55 +0000 (00:58 -0700)]
Fix bug #72674 - check both curl_escape and curl_unescape

8 years agoFix bug #72724
Nikita Popov [Tue, 2 Aug 2016 22:33:32 +0000 (00:33 +0200)]
Fix bug #72724

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Tue, 2 Aug 2016 16:47:36 +0000 (18:47 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #72709: imagesetstyle() causes OOB read for empty $styles
Christoph M. Becker [Tue, 2 Aug 2016 16:41:20 +0000 (18:41 +0200)]
Fix #72709: imagesetstyle() causes OOB read for empty $styles

Calling imagesetstyle() with an empty $styles array caused gdImageSetStyle()
to be called with `noOfPixels==0`, what could have lead to OOB reads.
Actually, this issue will be fixed in libgd, but to avoid issues when older
libgd is in use, we simply disallow passing an empty $styles array to
imagesetstyle(), what wouldn't serve a useful purpose anyway.

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Tue, 2 Aug 2016 12:40:31 +0000 (14:40 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  update NEWS
  cleanup table after test
  - lastInsertId using Postgres Lastval() function

8 years agoupdate NEWS
Anatol Belski [Tue, 2 Aug 2016 12:36:56 +0000 (14:36 +0200)]
update NEWS

8 years agocleanup table after test
Anatol Belski [Tue, 2 Aug 2016 12:35:24 +0000 (14:35 +0200)]
cleanup table after test

8 years ago- lastInsertId using Postgres Lastval() function
Pablo Santiago Sánchez [Thu, 28 Jul 2016 01:12:56 +0000 (22:12 -0300)]
- lastInsertId using Postgres Lastval() function

8 years agoprepare next
Anatol Belski [Tue, 2 Aug 2016 09:13:20 +0000 (11:13 +0200)]
prepare next

8 years agofix php_version.h
Anatol Belski [Tue, 2 Aug 2016 09:06:33 +0000 (11:06 +0200)]
fix php_version.h

8 years agoupdate NEWS
Anatol Belski [Sun, 31 Jul 2016 12:58:46 +0000 (14:58 +0200)]
update NEWS

8 years agoRevert "upgraded to PCRE 8.39"
Anatol Belski [Sun, 31 Jul 2016 12:55:17 +0000 (14:55 +0200)]
Revert "upgraded to PCRE 8.39"

This reverts commit 2fba6468374a15efc82aaac8cbfc600b29c5404f.

PCRE-8.39 throws weird valgrind backtraces on some systems, see
http://news.php.net/php.cvs/93494 . Those could be false positives
due to some changes in JIT, still i couldn't 100% ensure this.
Thus, better we continue to ship 8.38 bundled for now, and apply
patches, if needed.

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Sat, 30 Jul 2016 16:35:41 +0000 (18:35 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoRevert "Fixed bug #71219"
Nikita Popov [Sat, 30 Jul 2016 16:34:34 +0000 (18:34 +0200)]
Revert "Fixed bug #71219"

This reverts commit 14d674442ef86ad4e862228a1ff5ecd322ae7759.

I misread the discussion on the bug -- this is not the correct
fix. However the other proposed fix does not work either, so just
reverting for now.

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Sat, 30 Jul 2016 16:22:07 +0000 (18:22 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFixed bug #71219
Nikita Popov [Sat, 30 Jul 2016 16:21:19 +0000 (18:21 +0200)]
Fixed bug #71219

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Sat, 30 Jul 2016 14:29:10 +0000 (16:29 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
ext/wddx/wddx.c

8 years agoAdd missing TSRMLS_FETCH()
Nikita Popov [Sat, 30 Jul 2016 14:28:42 +0000 (16:28 +0200)]
Add missing TSRMLS_FETCH()

8 years agoFix incorrect merge
Nikita Popov [Sat, 30 Jul 2016 14:07:54 +0000 (16:07 +0200)]
Fix incorrect merge

Forgot to amend the merge fixes...

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Sat, 30 Jul 2016 13:51:23 +0000 (15:51 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFixed bug #72142
Nikita Popov [Sat, 30 Jul 2016 13:10:54 +0000 (15:10 +0200)]
Fixed bug #72142

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 30 Jul 2016 09:49:19 +0000 (11:49 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agofixes bad address given to onig_error_code_to_str
ju1ius [Sat, 30 Jul 2016 04:08:25 +0000 (06:08 +0200)]
fixes bad address given to onig_error_code_to_str

Closes bug #72710

(cherry picked from commit 0fb7eb6723bcc6fd98053911543e801edb5ab763)

8 years agoFix ref handling in array_merge/replace_recursive()
Nikita Popov [Fri, 29 Jul 2016 17:07:04 +0000 (19:07 +0200)]
Fix ref handling in array_merge/replace_recursive()

As usual, if the reference has rc=1 it really isn't a reference.

8 years agodocument file cache fallback ini directive
Anatol Belski [Fri, 29 Jul 2016 11:04:51 +0000 (13:04 +0200)]
document file cache fallback ini directive

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 28 Jul 2016 23:12:12 +0000 (01:12 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

# Resolved conflicts:
# ext/calendar/calendar.c

8 years agoFix #71894: AddressSanitizer: global-buffer-overflow in zif_cal_from_jd
Christoph M. Becker [Thu, 28 Jul 2016 22:24:46 +0000 (00:24 +0200)]
Fix #71894: AddressSanitizer: global-buffer-overflow in zif_cal_from_jd

Julian days < 347998 denote invalid Jewish calendar dates, so
cal_from_jd($jd, CAL_JEWISH) and jdmonthname($jd, CAL_MONTH_JEWISH) should
actually fail. For BC we don't yet let them though, but we fix the OOB read
that happens in this case, and we also adjust cal_from_jd()'s return value
to have empty strings for "abbrevdayname" and "dayname" instead of "Sun"/
"Sunday" and NULL for "dow" instead of 0, which doesn't make any sense.

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 28 Jul 2016 18:00:37 +0000 (20:00 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoImplement FR #65462: Please add tests for gregorian and jewish overflow fixes
Christoph M. Becker [Thu, 28 Jul 2016 17:59:14 +0000 (19:59 +0200)]
Implement FR #65462: Please add tests for gregorian and jewish overflow fixes

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 28 Jul 2016 17:17:56 +0000 (19:17 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #67976: cal_days_month() fails for final month of the French calendar
Christoph M. Becker [Thu, 28 Jul 2016 17:13:58 +0000 (19:13 +0200)]
Fix #67976: cal_days_month() fails for final month of the French calendar

The French calendar ends on 0014-13-05, so trying to calculate the Julian
day of 0015-01-01 fails. We cater to that by returning the hard-coded value.

8 years agoRevert "Make call_user_func() on reference args consistent"
Nikita Popov [Thu, 28 Jul 2016 16:45:44 +0000 (18:45 +0200)]
Revert "Make call_user_func() on reference args consistent"

This reverts commit fafe01b07bfcb4f4a9088dd89195f2f5acba8fd0.

See bug #72698, there is code using this behavior. Reverting for
PHP 7.0 *only*. The fix is still in PHP 7.1.

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 28 Jul 2016 16:24:13 +0000 (18:24 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoBug #69975 had already been fixed as of PHP 5.6.12
Christoph M. Becker [Thu, 28 Jul 2016 16:22:19 +0000 (18:22 +0200)]
Bug #69975 had already been fixed as of PHP 5.6.12

Also CVE-2015-8879 had been assigned.

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 28 Jul 2016 15:30:29 +0000 (17:30 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #72677: SCM_CREDENTIALS related tests should be skipped on AIX
Christoph M. Becker [Thu, 28 Jul 2016 15:19:47 +0000 (17:19 +0200)]
Fix #72677: SCM_CREDENTIALS related tests should be skipped on AIX

Patch provided by matthieu dot sarter dot external at atos dot net.

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 28 Jul 2016 14:54:36 +0000 (16:54 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #72676: Test cli_process_title_unix fails on AIX
Christoph M. Becker [Thu, 28 Jul 2016 14:49:45 +0000 (16:49 +0200)]
Fix #72676: Test cli_process_title_unix fails on AIX

Patch provided by matthieu dot sarter dot external at atos dot net.

8 years agoUpdate to SQLite3 3.13.0
Christoph M. Becker [Thu, 28 Jul 2016 14:29:02 +0000 (16:29 +0200)]
Update to SQLite3 3.13.0

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 28 Jul 2016 13:24:41 +0000 (15:24 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

# Resolved conflicts:
# ext/mbstring/php_mbregex.c

8 years agoFix #72694: mb_ereg_search_setpos does not accept a string's last position
Christoph M. Becker [Thu, 28 Jul 2016 13:21:48 +0000 (15:21 +0200)]
Fix #72694: mb_ereg_search_setpos does not accept a string's last position

Setting the search position immediately behind the last character should be
allowed, so we fix this off-by-one error.

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 28 Jul 2016 11:59:13 +0000 (13:59 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #72693: mb_ereg_search increments search position when a match zero-width
Christoph M. Becker [Thu, 28 Jul 2016 11:56:40 +0000 (13:56 +0200)]
Fix #72693: mb_ereg_search increments search position when a match zero-width

That's caused by an off-by-one error, which we fix.

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 28 Jul 2016 11:09:09 +0000 (13:09 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

# Resolved conflicts:
# ext/mbstring/php_mbregex.c

8 years agoFix #72691: mb_ereg_search raises a warning if a match zero-width
Christoph M. Becker [Thu, 28 Jul 2016 11:07:05 +0000 (13:07 +0200)]
Fix #72691: mb_ereg_search raises a warning if a match zero-width

That warning doesn't make sense (PCRE doesn't throw such a warning either),
so we remove it.

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 28 Jul 2016 10:28:10 +0000 (12:28 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoBug #6836 has already been fixed in PHP 5.6.24 and 7.0.9
Christoph M. Becker [Thu, 28 Jul 2016 10:26:41 +0000 (12:26 +0200)]
Bug #6836 has already been fixed in PHP 5.6.24 and 7.0.9

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Pierrick Charron [Thu, 28 Jul 2016 03:36:22 +0000 (23:36 -0400)]
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
ext/curl/interface.c

8 years agoFixed bug #71929 (CURLINFO_CERTINFO data parsing error).
Pierrick Charron [Thu, 28 Jul 2016 03:30:20 +0000 (23:30 -0400)]
Fixed bug #71929 (CURLINFO_CERTINFO data parsing error).

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Pierrick Charron [Wed, 27 Jul 2016 22:17:43 +0000 (18:17 -0400)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoUpdate NEWS
Pierrick Charron [Wed, 27 Jul 2016 21:52:05 +0000 (17:52 -0400)]
Update NEWS

8 years agocleanup the table after the test run
Anatol Belski [Wed, 27 Jul 2016 21:50:10 +0000 (23:50 +0200)]
cleanup the table after the test run

8 years agoupdate NEWS
Anatol Belski [Wed, 27 Jul 2016 21:30:23 +0000 (23:30 +0200)]
update NEWS

8 years agoImplemented FR #72633 Postgres PDO lastInsertId() should work without specifying...
root [Tue, 19 Jul 2016 19:28:25 +0000 (15:28 -0400)]
Implemented FR #72633 Postgres PDO lastInsertId() should work without specifying a sequence

8 years agoFixed bug #72683 getmxrr broken
Anatol Belski [Wed, 27 Jul 2016 18:48:45 +0000 (20:48 +0200)]
Fixed bug #72683 getmxrr broken

8 years agoupdate NEWS
Anatol Belski [Wed, 27 Jul 2016 18:41:27 +0000 (20:41 +0200)]
update NEWS

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Wed, 27 Jul 2016 16:59:40 +0000 (18:59 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

# Resolved conflicts:
# ext/pcre/php_pcre.c

8 years agoFix #72688: preg_match missing group names in matches
Christoph M. Becker [Wed, 27 Jul 2016 16:50:52 +0000 (18:50 +0200)]
Fix #72688: preg_match missing group names in matches

We have to multiply with 0x100 to properly scale the high byte.

8 years agoFixed a potential segfault in zend_objects_store_free_object_storage()
Bob Weinand [Wed, 27 Jul 2016 16:08:43 +0000 (18:08 +0200)]
Fixed a potential segfault in zend_objects_store_free_object_storage()

Under the special circumstance where a garbage collected objects bucket slot was not reused until the end of the script, we get access into freed memory...
No test added as it usually is valgrind-only, and only sometimes when the memory happens to have changed (i.e. (GC_FLAGS(obj) & IS_OBJ_FREE_CALLED) == 0), it actually *may* segfault

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Wed, 27 Jul 2016 14:47:09 +0000 (16:47 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

# Resolved conflicts:
# ext/sqlite3/sqlite3.c

8 years agoImplement #72653: SQLite should allow opening with empty filename
Christoph M. Becker [Wed, 27 Jul 2016 14:37:49 +0000 (16:37 +0200)]
Implement #72653: SQLite should allow opening with empty filename

From the [sqlite3_open](https://www.sqlite.org/c3ref/open.html) docs:

| If the filename is an empty string, then a private, temporary on-disk
| database will be created. This private database will be automatically
| deleted as soon as the database connection is closed.

We make that facility available to userland.

While we're at it, we also do some minor optimizations, remove the
unnecessary check for NUL characters in filename, which is already catered
to by ZPP(p), and add a missing `return` in case db_obj isn't initialized.

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Wed, 27 Jul 2016 13:56:52 +0000 (15:56 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
ext/standard/ftp_fopen_wrapper.c

8 years agoFix bug #72667
Ville Hukkamäki [Mon, 25 Jul 2016 18:50:38 +0000 (18:50 +0000)]
Fix bug #72667

Open data stream after receiving PASV reply, before sending the
main request.

Included test cases for opendir() with ftp:// and ftps:// wrappers.
Test cases re-use ext/ftp/tests/server.inc

Conflicts:
ext/standard/ftp_fopen_wrapper.c

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Pierrick Charron [Wed, 27 Jul 2016 04:38:54 +0000 (00:38 -0400)]
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
main/streams/streams.c

8 years agoFixed bug #72686 (zlib: url support is broken).
Pierrick Charron [Wed, 27 Jul 2016 04:33:13 +0000 (00:33 -0400)]
Fixed bug #72686 (zlib: url support is broken).

zlib: support is broken since a really long time.
It never worked on versions >= PHP5.6 so we can just remove
this dead code.

Bug was introduced 2006-05-14 (Before 5.2.0)

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Pierrick Charron [Wed, 27 Jul 2016 00:36:34 +0000 (20:36 -0400)]
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
ext/spl/spl_iterators.c

8 years agoFixed bug #72684 (AppendIterator segfault with closed generator)
Pierrick Charron [Wed, 27 Jul 2016 00:34:16 +0000 (20:34 -0400)]
Fixed bug #72684 (AppendIterator segfault with closed generator)

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Pierrick Charron [Tue, 26 Jul 2016 23:20:12 +0000 (19:20 -0400)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFixed bug #71709
Pierrick Charron [Tue, 26 Jul 2016 22:50:15 +0000 (18:50 -0400)]
Fixed bug #71709

When curl_setopt is called with an empty slist as value, we should
not add the empty slist to the list of slist to free.

8 years agoupgraded to PCRE 8.39
Anatol Belski [Sun, 19 Jun 2016 18:38:31 +0000 (20:38 +0200)]
upgraded to PCRE 8.39

(cherry picked from commit 9d4fe9672a1c32d1349f267d24d079e3ebdc83e8)

8 years agoFix GMP unserialization with self-reference
Nikita Popov [Mon, 25 Jul 2016 21:02:54 +0000 (23:02 +0200)]
Fix GMP unserialization with self-reference

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Mon, 25 Jul 2016 15:07:41 +0000 (17:07 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

# Resolved conflicts:
# ext/sqlite3/sqlite3.c
# ext/sqlite3/tests/bug72668.phpt

8 years agoFurther fixes wrt. bug #72668
Christoph M. Becker [Mon, 25 Jul 2016 15:03:10 +0000 (17:03 +0200)]
Further fixes wrt. bug #72668

Not only SQLite3::querySingle(), but also SQLite3::query() and
SQLite3Stmt::execute() were affected.

8 years agoFixed bug #72668 (Spurious warning when exception is thrown in user defined function)
Xinchen Hui [Mon, 25 Jul 2016 12:28:39 +0000 (20:28 +0800)]
Fixed bug #72668 (Spurious warning when exception is thrown in user defined function)

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Mon, 25 Jul 2016 08:17:41 +0000 (10:17 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  update NEWS
  Make phpize use PHP_PREFIX as the default location (windows)
  Enable 'nmake test' on building extensions

8 years agoupdate NEWS
Anatol Belski [Mon, 25 Jul 2016 08:14:18 +0000 (10:14 +0200)]
update NEWS

8 years agoMake phpize use PHP_PREFIX as the default location (windows)
y-uti [Sat, 26 Mar 2016 09:56:25 +0000 (18:56 +0900)]
Make phpize use PHP_PREFIX as the default location (windows)

The default path to where an extension is installed should be
PHP_PREFIX/ext on windows.

8 years agoEnable 'nmake test' on building extensions
y-uti [Mon, 28 Mar 2016 10:50:31 +0000 (19:50 +0900)]
Enable 'nmake test' on building extensions

On Windows, Makefile generated by phpize doesn't have the 'test'
target rule. This commit fixes that and enables 'nmake test' on
Windows.

8 years agoupdate NEWS
Anatol Belski [Mon, 25 Jul 2016 07:51:13 +0000 (09:51 +0200)]
update NEWS

8 years agoEnable 'nmake test' on building extensions
y-uti [Mon, 28 Mar 2016 10:50:31 +0000 (19:50 +0900)]
Enable 'nmake test' on building extensions

On Windows, Makefile generated by phpize doesn't have the 'test'
target rule. This commit fixes that and enables 'nmake test' on
Windows.

8 years agoMake phpize use PHP_PREFIX as the default location (windows)
y-uti [Sat, 26 Mar 2016 09:56:25 +0000 (18:56 +0900)]
Make phpize use PHP_PREFIX as the default location (windows)

The default path to where an extension is installed should be
PHP_PREFIX/ext on windows.

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Mon, 25 Jul 2016 00:02:54 +0000 (02:02 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

# Resolved conflicts:
# ext/gd/tests/gd_info_variation1.phpt

8 years agoFix broken test case
Christoph M. Becker [Mon, 25 Jul 2016 00:00:37 +0000 (02:00 +0200)]
Fix broken test case

d28f1da introduced a test regression, due to potentially additional output
regarding FreeType support. We fix that by making the test more resilient.

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sun, 24 Jul 2016 22:16:21 +0000 (00:16 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

# Resolved conflicts:
# ext/gd/tests/gd_info_variation1.phpt