root
12628e9a46
Implemented FR #72633 Postgres PDO lastInsertId() should work without specifying a sequence
2016-07-27 23:00:12 +02:00
Anatol Belski
c52322707e
Fixed bug #72683 getmxrr broken
2016-07-27 20:48:45 +02:00
Christoph M. Becker
40afd77826
Merge branch 'PHP-5.6' into PHP-7.0
...
# Resolved conflicts:
# ext/pcre/php_pcre.c
2016-07-27 19:00:38 +02:00
Christoph M. Becker
315c0536c2
Fix #72688 : preg_match missing group names in matches
...
We have to multiply with 0x100 to properly scale the high byte.
2016-07-27 18:50:52 +02:00
Christoph M. Becker
23c359c276
Merge branch 'PHP-5.6' into PHP-7.0
...
# Resolved conflicts:
# ext/sqlite3/sqlite3.c
2016-07-27 16:48:29 +02:00
Christoph M. Becker
cc125f277b
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.
2016-07-27 16:41:03 +02:00
Nikita Popov
0d2c4f822c
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/standard/ftp_fopen_wrapper.c
2016-07-27 15:58:06 +02:00
Ville Hukkamäki
cce457c68c
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
2016-07-27 15:55:47 +02:00
Pierrick Charron
2597f5d665
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/spl/spl_iterators.c
2016-07-26 20:36:34 -04:00
Pierrick Charron
4c2e1a13be
Fixed bug #72684 (AppendIterator segfault with closed generator)
2016-07-26 20:34:16 -04:00
Pierrick Charron
31ed322b06
Merge branch 'PHP-5.6' into PHP-7.0
2016-07-26 19:20:12 -04:00
Pierrick Charron
24d8f6ed7c
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.
2016-07-26 18:50:15 -04:00
Anatol Belski
2fba646837
upgraded to PCRE 8.39
...
(cherry picked from commit 9d4fe9672a
)
2016-07-26 15:07:04 +02:00
Nikita Popov
b1d36cb820
Fix GMP unserialization with self-reference
2016-07-25 23:04:00 +02:00
Christoph M. Becker
ccf39dd552
Merge branch 'PHP-5.6' into PHP-7.0
...
# Resolved conflicts:
# ext/sqlite3/sqlite3.c
# ext/sqlite3/tests/bug72668.phpt
2016-07-25 17:07:41 +02:00
Christoph M. Becker
64e3e932fc
Further fixes wrt. bug #72668
...
Not only SQLite3::querySingle(), but also SQLite3::query() and
SQLite3Stmt::execute() were affected.
2016-07-25 17:03:10 +02:00
Xinchen Hui
f5e56cf970
Fixed bug #72668 (Spurious warning when exception is thrown in user defined function)
2016-07-25 20:28:39 +08:00
Christoph M. Becker
138fea83fe
Merge branch 'PHP-5.6' into PHP-7.0
...
# Resolved conflicts:
# ext/gd/tests/gd_info_variation1.phpt
2016-07-25 02:02:54 +02:00
Christoph M. Becker
305bddb0ed
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.
2016-07-25 02:00:37 +02:00
Christoph M. Becker
4db4997ac5
Merge branch 'PHP-5.6' into PHP-7.0
...
# Resolved conflicts:
# ext/gd/tests/gd_info_variation1.phpt
2016-07-25 00:16:21 +02:00
Christoph M. Becker
d28f1dae9d
Fix broken test case
...
The test claims that it would be "checking all the values in returned array",
but due to the use of %a it actually skipped elements. We fix that by using
%s instead.
2016-07-25 00:13:44 +02:00
Xinchen Hui
ad96a052d9
Fixed bug #72660 (NULL Pointer dereference in zend_virtual_cwd)
2016-07-24 23:58:22 +08:00
Anatol Belski
da3995852e
regenerate date parser with re2c 0.15.3
2016-07-24 14:53:53 +02:00
Anatol Belski
9cd23ff84f
regenerate date parser with re2c 0.15.3
2016-07-24 14:50:10 +02:00
Nikita Popov
aecc435482
Merge branch 'PHP-5.6' into PHP-7.0
2016-07-24 00:18:47 +02:00
Nikita Popov
04b42b1e05
More tolerance in another IntlCalendar test
...
Again, off-by-1000 is expected if we're late in the second. Add an
extra 1000 to account for actual delta in call times.
2016-07-24 00:15:14 +02:00
Nikita Popov
2194690625
Ensure session GC is not run during variation6.phpt
...
The implemented gc() handler simply deletes all sessions, including
the current one. This may cause a subsequent unlink() warning.
Avoid this by preventing GC from running.
2016-07-24 00:07:54 +02:00
Anatol Belski
958fa34c16
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix test
2016-07-23 21:03:45 +02:00
Anatol Belski
80fee637f4
fix test
2016-07-23 20:55:39 +02:00
Christoph M. Becker
2c0a18480d
Merge branch 'PHP-5.6' into PHP-7.0
2016-07-23 19:36:53 +02:00
Christoph M. Becker
88838dd282
Fix #68712 : suspicious if-else statements
2016-07-23 19:29:43 +02:00
Christoph M. Becker
03ccd42b18
Merge branch 'PHP-5.6' into PHP-7.0
2016-07-23 18:12:14 +02:00
Christoph M. Becker
9fbd0c1ff1
Fix copy&paste errors in gd_interpolation.c
...
According to <https://github.com/libgd/libgd/commit/f101380 >.
2016-07-23 18:09:18 +02:00
Christoph M. Becker
5056d59f96
Merge branch 'PHP-5.6' into PHP-7.0
2016-07-23 16:55:16 +02:00
Christoph M. Becker
2c16b9cf62
Fix #66555 : Always false condition in ext/gd/libgd/gdkanji.c
...
This issue has already been fixed in libgd[1], so we fix PHP's bundled
libgd accordingly.
[1] <https://github.com/libgd/libgd/commit/aa1d71c >
2016-07-23 16:48:07 +02:00
Nikita Popov
f12fd5c2d3
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/standard/ftp_fopen_wrapper.c
2016-07-23 13:29:57 +02:00
vhuk
65abdb556d
Fix for bug #54431
2016-07-23 13:28:42 +02:00
Nikita Popov
7d77289717
Merge branch 'PHP-5.6' into PHP-7.0
2016-07-22 17:22:13 +02:00
Nikita Popov
4fc1bfa93b
Make IntlCalendar::getNow() test more tolerant
...
Due to the *1000 factor the two values may be off-by-1000 even
without any actual delay, so increase the check to 2000.
2016-07-22 17:20:56 +02:00
Xinchen Hui
6929121423
Fixed bug #72647 (xmlrpc_encode() unexpected output after referencing array elements)
2016-07-22 23:15:15 +08:00
Christoph M. Becker
9a2207c90a
Merge branch 'PHP-5.6' into PHP-7.0
...
# Resolved conflicts:
# ext/spl/spl_directory.c
2016-07-22 15:27:55 +02:00
Christoph M. Becker
6b116932b2
Fix #72646 : SplFileObject::getCsvControl does not return the escape character
...
This has obviously been missed when adding the $escape parameter to
SplFileObject::setCsvControl() in PHP 5.3, so we catch up on this.
2016-07-22 15:24:50 +02:00
Christoph M. Becker
4472f9e822
Merge branch 'PHP-5.6' into PHP-7.0
2016-07-21 18:39:27 +02:00
Christoph M. Becker
f2c2a4be9e
Fix #72330 : CSV fields incorrectly split if escape char followed by UTF chars
...
We must not forget to properly reset the state for multibyte characters
following an escape character.
2016-07-21 18:37:24 +02:00
Remi Collet
a2a122804e
bump zip extension version
2016-07-21 08:44:26 +02:00
Xinchen Hui
4a643e5e13
Fixed bug #72639 (Segfault when instantiating class that extends IntlCalendar and adds a property)
2016-07-21 14:25:15 +08:00
Anatol Belski
b57a38f584
regenerate date parser with re2c 0.13.5 to fix OSX issues
2016-07-20 17:57:39 +02:00
Anatol Belski
90c26fb6b1
regenerate date parser with re2c 0.13.5
2016-07-20 13:32:53 +02:00
Xinchen Hui
e4af29b0b7
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed arginfo
2016-07-20 18:07:18 +08:00
Xinchen Hui
9ebc96116b
Fixed arginfo
2016-07-20 18:07:02 +08:00