clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-25 20:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
94,942 Commits 493 Branches 1,366 Tags 850 MiB
2004585d03
Commit Graph

94942 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph M. Becker
c301adbbd1 Fix #72677: SCM_CREDENTIALS related tests should be skipped on AIX 
Patch provided by matthieu dot sarter dot external at atos dot net.
 2016-07-28 17:19:47 +02:00
Christoph M. Becker
95190db84d Merge branch 'PHP-5.6' into PHP-7.0 2016-07-28 16:54:36 +02:00
Christoph M. Becker
6e886f07a8 Fix #72676: Test cli_process_title_unix fails on AIX 
Patch provided by matthieu dot sarter dot external at atos dot net.
 2016-07-28 16:51:45 +02:00
Christoph M. Becker
81c25abd25 Update to SQLite3 3.13.0 2016-07-28 16:39:24 +02:00
Christoph M. Becker
805dc0ea47 Merge branch 'PHP-5.6' into PHP-7.0 
# Resolved conflicts:
#	ext/mbstring/php_mbregex.c
 2016-07-28 15:26:29 +02:00
Christoph M. Becker
ee6900c3de 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.
 2016-07-28 15:21:48 +02:00
Christoph M. Becker
a621023168 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-28 14:03:40 +02:00
Christoph M. Becker
56cdaecb28 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.
 2016-07-28 13:57:38 +02:00
Christoph M. Becker
18a37eeeec Merge branch 'PHP-5.6' into PHP-7.0 
# Resolved conflicts:
#	ext/mbstring/php_mbregex.c
 2016-07-28 13:12:40 +02:00
Christoph M. Becker
d276e6a838 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.
 2016-07-28 13:07:05 +02:00
Christoph M. Becker
c7a4e37d97 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-28 12:29:00 +02:00
Christoph M. Becker
0ae8c337a3 Bug #6836 has already been fixed in PHP 5.6.24 and 7.0.9 2016-07-28 12:26:41 +02:00
Pierrick Charron
bf37b97d9c Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	ext/curl/interface.c
 2016-07-27 23:36:22 -04:00
Pierrick Charron
30a5ed3a79 Fixed bug #71929 (CURLINFO_CERTINFO data parsing error). 2016-07-27 23:30:20 -04:00
Pierrick Charron
1b681880c1 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-27 18:17:43 -04:00
Pierrick Charron
ed16f2fed5 Update NEWS 2016-07-27 17:52:05 -04:00
Anatol Belski
266c62070f cleanup the table after the test run 2016-07-27 23:50:10 +02:00
Anatol Belski
e0294b39e3 update NEWS 2016-07-27 23:30:23 +02:00
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
Anatol Belski
6e8b2d21d1 update NEWS 2016-07-27 20:41:27 +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
Bob Weinand
5513f00a97 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
 2016-07-27 18:08:43 +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
6714f73545 Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	main/streams/streams.c
 2016-07-27 00:38:54 -04:00
Pierrick Charron
074b86d845 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)
 2016-07-27 00:33:13 -04: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
Anatol Belski
9a4c9348b1 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
 2016-07-25 10:17:41 +02:00
Anatol Belski
0c34d515f1 update NEWS 2016-07-25 10:14:18 +02:00
y-uti
3f842655db 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.
 2016-07-25 10:01:34 +02:00
y-uti
72ac8cf5ad 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.
 2016-07-25 09:55:07 +02:00
Anatol Belski
27dd8048b7 update NEWS 2016-07-25 09:51:13 +02:00
y-uti
0f9bf85ad9 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.
 2016-07-25 09:46:06 +02:00
y-uti
6ed7136371 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.
 2016-07-25 09:46:00 +02: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