clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 11:27:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
94,784 Commits 491 Branches 1,363 Tags 847 MiB
a93c62aafa
Commit Graph

94784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph M. Becker
a93c62aafa Merge branch 'PHP-5.6' into PHP-7.0 2016-08-13 11:47:20 +02:00
Christoph M. Becker
ae3b2078ea Fix #72823: strtr out-of-bound access 
If php_strtr_array_prepare_repls() reports pattern_len == 0, we return
early to avoid OOB accesses, and because there is nothing to replace anyway.
 2016-08-13 11:40:33 +02:00
Christoph M. Becker
175d94b6e5 Merge branch 'PHP-5.6' into PHP-7.0 2016-08-13 01:21:57 +02:00
Christoph M. Becker
7938ebf6c1 Fix #60665: call to empty() on NULL result using PDO::FETCH_LAZY returns false 
The has_property handler only checked whether a respective column name
exists, but neither whether the column value is set, nor whether it is
empty, respectively. We fix that to match the behavior of POD:FETCH_OBJ in
particular and PHP in general.
 2016-08-13 01:11:13 +02:00
Christoph M. Becker
92a076a92b Fix #72793: xml_parser_free leaks mem when execute xml_set_object 2016-08-12 12:54:21 +02:00
Xinchen Hui
fe41f87e46 Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:/php-src:
  Fix URL rewriter partially
  Support "git worktree"
 2016-08-12 16:25:18 +08:00
Xinchen Hui
e03480bfab Fixed bug #72813 (Segfault with __get returned by ref) 
This should be safe change, as we don't dereference value and member
after calling setter/getter.

And compare to adding unref codes, this is much cheaper.
 2016-08-12 16:24:46 +08:00
Yasuo Ohgaki
ae3782a0db Fix URL rewriter partially 2016-08-11 09:18:47 +09:00
Yasuo Ohgaki
f19578ad58 Fix URL rewriter partially 2016-08-11 09:18:33 +09:00
Yasuo Ohgaki
5bf14e4699 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Support "git worktree"
 2016-08-11 08:09:05 +09:00
Yasuo Ohgaki
a38bc7b373 Support "git worktree" 2016-08-11 08:08:26 +09:00
Keyur
bb955ec937 Add NEWS 2016-08-09 17:29:36 +00:00
Keyur
2b7715b925 Merge branch 'pull-request/2067' into PHP-7.0 2016-08-09 17:27:52 +00:00
Keyur
2ab9a2d4be Fix ASSERT logic 2016-08-09 14:41:20 +00:00
Keyur
98e4d509f6 Bugfix 72791: fix memory leak in PDO persistent connections 2016-08-09 14:01:25 +00:00
Nikita Popov
842e408c67 Don't copy mime types in CLI server 
This is both unnecessary and causes leaks in valgrind.
 2016-08-09 15:34:03 +02:00
Christopher Jones
3c5e6b29ce Remove obsolete Id tags 2016-08-09 16:12:58 +10:00
Christopher Jones
797f69ef32 Bump version in OCI8 test 2016-08-09 15:59:59 +10:00
Xinchen Hui
e52cb1858d Fixed bug #72788 (Invalid memory access when using persistent PDO connection) 2016-08-09 11:32:16 +08:00
Xinchen Hui
ebd21de1e4 Merge branch 'bug72788' of https://github.com/keyurdg/php-src into PHP-7.0 
* 'bug72788' of https://github.com/keyurdg/php-src:
  Remove typo'd commit
  Fix bug 72788: Invalid memory access when database_object_handle is undefined. Also fix memory leak in dbh_free when using persistent PDO connections.
 2016-08-09 11:25:32 +08:00
Keyur
a74c7cb528 Remove typo'd commit 2016-08-09 01:36:15 +00:00
Keyur
3f25c4228a Fix bug 72788: Invalid memory access when database_object_handle 
is undefined. Also fix memory leak in dbh_free when using persistent
PDO connections.
 2016-08-09 00:16:46 +00:00
Andrea Faulds
5358c7cf5e Replace dead branch with ZEND_ASSERT() 2016-08-08 20:56:11 +01:00
Christoph M. Becker
9d03310b23 Merge branch 'PHP-5.6' into PHP-7.0 2016-08-08 18:45:27 +02:00
Christoph M. Becker
243d5fcb1f Add test for bug #69107: finfo no longer detects PHP files 2016-08-08 18:43:33 +02:00
Lauri Kenttä
e616bc8694 Fix bug #55451 
Make substr_compare ignore the length if it's NULL. This allows to
use the last parameter (case_insensitivity) with the default length.
 2016-08-07 18:48:36 +02:00
Nikita Popov
56d7e98ddf Merge branch 'PHP-5.6' into PHP-7.0 2016-08-07 18:38:28 +02:00
Nikita Popov
40d237df1f Fix stream_socket_enable_crypto() test 
The whole test doesn't make any sense at all, but this only fixes
the additional warnings you get when linked against openssl w/o
SSL3.
 2016-08-07 18:37:38 +02:00
Christopher Jones
dd7cdab8e4 Remove old $Id$ tags 2016-08-07 10:24:56 +10:00
Christopher Jones
944d473eaa Sync with 7.1 branch changes from Nikita & Dimitri to keep OCI8 code identical 2016-08-07 10:17:06 +10:00
Christopher Jones
b601dc5b29 Fix bug #72524 (Binding null values triggers ORA-24816 error) 2016-08-07 09:39:44 +10:00
Kalle Sommer Nielsen
3d51b1d544 Fix the fix (Nikita), thanks! 2016-08-06 12:08:13 +02:00
Kalle Sommer Nielsen
5e2b8349b4 Check the return value of dbconvert() in mssql_guid_string(), as it may return -1 in case the conversion failed. In that case false is returned. 
Also initialize buffer and buffer2 to NULL, which should fix bug #72039 (Use of uninitialised value on mssql_guid_string).

This only applies to 5.6, as we do not have mssql in 7.0 anymore
 2016-08-06 10:17:49 +02:00
Nikita Popov
a2a2ea18fe Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	ext/standard/ftp_fopen_wrapper.c
 2016-08-05 23:09:30 +02:00
Ville Hukkamaki
65056e9d6c Fix #72764 
Negotiate data channel encryption after NLST command.
This is to prevent issues with IIS and ProFTPD.
 2016-08-05 22:56:54 +02:00
Nikita Popov
807e81937b Fix bug #72767 
The page size calculation did not account for the size of the
stack header (or rather it did account for it, but in the wrong
direction...)
 2016-08-05 19:55:10 +02:00
Christoph M. Becker
62f12a8b86 Merge branch 'PHP-5.6' into PHP-7.0 2016-08-04 12:09:16 +02:00
Christoph M. Becker
a8515a339d Fix broken skip marker in test case 2016-08-04 12:06:07 +02:00
Matteo Beccati
4003595d60 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Clean up FR #72633
 2016-08-04 09:30:48 +02:00
Matteo Beccati
d3a8e107ac Clean up FR #72633 2016-08-04 09:28:58 +02:00
Christopher Jones
2b7a699acd Fixed invalid handle error with Implicit Result Sets 2016-08-04 17:01:57 +10:00
Christopher Jones
78488a54c8 Fixed invalid handle error with Implicit Result Sets and bump OCI8 version. 2016-08-04 16:55:54 +10:00
Christopher Jones
06be3c659c Merge branch 'PHP-7.0' of https://git.php.net/repository/php-src into PHP-7.0 2016-08-04 16:45:29 +10:00
Stanislav Malyshev
b57474f23e Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #72716 - initialize buffer before read

Conflicts:
	ext/standard/ftp_fopen_wrapper.c
 2016-08-03 23:00:32 -07:00
Stanislav Malyshev
4f861b6071 Fix bug #72716 - initialize buffer before read 2016-08-03 22:59:42 -07:00
Ferenc Kovacs
db4211a8fe Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	configure.in
	main/php_version.h
 2016-08-04 01:42:00 +02:00
Ferenc Kovacs
562c17eb4e 5.6.26 will be next 2016-08-04 01:39:37 +02:00
Anatol Belski
138689ffb7 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  improve the check, avoid strlen on NULL
 2016-08-03 18:28:48 +02:00
Anatol Belski
9667ee4f72 improve the check, avoid strlen on NULL 2016-08-03 18:26:29 +02:00
Anatol Belski
2bdb34fd40 update NEWS 2016-08-03 17:39:55 +02:00