clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 05:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
99,503 Commits 494 Branches 1,367 Tags 786 MiB
3f89aec716
Commit Graph

9784 Commits

Author SHA1 Message Date
Joe Watkins
3f89aec716
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix #70103: ZipArchive::addGlob ignores remove_all_path option
  news entry for PR #1430
 2017-01-06 05:40:41 +00:00
Joe Watkins
a49aaf9ab0
Merge branch 'pull-request/1430' into PHP-7.0 
* pull-request/1430:
  Fix #70103: ZipArchive::addGlob ignores remove_all_path option
  news entry for PR 1430
 2017-01-06 05:39:48 +00:00
Christoph M. Becker
e7ce861def Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix #70417: PharData::compress() doesn't close temp file
 2017-01-05 18:51:04 +01:00
Christoph M. Becker
183a34a5cf Merge branch 'pull-request/2278' into PHP-7.0 
* pull-request/2278:
  Fix #70417: PharData::compress() doesn't close temp file
 2017-01-05 18:49:52 +01:00
Joe Watkins
3b741353e1
I am bad at counting (wrong date in news) 2017-01-05 16:56:26 +00:00
Joe Watkins
e627aa9841
bump version after release 2017-01-05 16:50:52 +00:00
Anatol Belski
997d902762 move dev to next 2017-01-05 01:12:18 +01:00
Joe Watkins
6c9164047e
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  get_defined_functions additional parameter to exclude disabled functions
  news entry for PR #1312
 2017-01-04 13:36:04 +00:00
Joe Watkins
63d116e571
Merge branch 'pull-request/1312' into PHP-7.0 
* pull-request/1312:
  get_defined_functions extra parameter to exclude disabled functions
  news entry for PR #1312
 2017-01-04 13:34:31 +00:00
Nikita Popov
661fad7beb Merge branch 'PHP-7.0' into PHP-7.1 2017-01-03 12:18:33 +01:00
Vince
cfd6e14842 Fix Bug #73462 - Persistent connections don't set $connect_errno 
Persistent connections skipped resetting $connect_error and $connect_errno values
This adds the "clear error" line to persistent connections for consistency
 2017-01-03 12:13:08 +01:00
Nikita Popov
737eb060db Merge branch 'PHP-7.0' into PHP-7.1 2017-01-02 23:39:35 +01:00
Nikita Popov
20c172d459 Add NEWS entries 2017-01-02 23:35:27 +01:00
vanviegen
abba56f605
Fix for sporadic segfault with MYSQLI_OPT_INT_AND_FLOAT_NATIVE 
Fixes bug #73800

news entry for PR #2249
 2017-01-02 14:56:41 +00:00
vanviegen
732f67ee6f
Fix for sporadic segfault with MYSQLI_OPT_INT_AND_FLOAT_NATIVE 
Fixes bug #73800

news entry for PR #2250
 2017-01-02 14:54:45 +00:00
Joe Watkins
156781baf5
news entry for PR #2267 2017-01-02 11:58:57 +00:00
Joe Watkins
9f4d05acec
news entry for PR #2267 2017-01-02 11:57:45 +00:00
Nikita Popov
70ca40d30f Merge branch 'PHP-7.0' into PHP-7.1 2017-01-01 19:26:36 +01:00
Nikita Popov
4877641962 Fixed bug #73154 
The object that is being serialized may be destroyed during the
execution of __sleep(), so operate on a copy instead.
 2017-01-01 19:24:41 +01:00
Joe Watkins
876b7b177f
news entry for PR #1414 2017-01-01 14:41:20 +00:00
Nikita Popov
878b8f0465 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-01 14:13:29 +01:00
Nikita Popov
9f560baef5 Merge branch 'PHP-5.6' into PHP-7.0 2017-01-01 14:12:26 +01:00
Nikita Popov
a65ad951ad FIx bug #70213 2017-01-01 14:10:49 +01:00
Joe Watkins
e51f284c78
Revert "news entry for PR #2263" 
This reverts commit 299e02c82a.
 2017-01-01 06:52:59 +00:00
Joe Watkins
299e02c82a
news entry for PR #2263 2017-01-01 06:49:42 +00:00
Nikita Popov
242d924e59 Fix bug #73847 2016-12-31 13:33:21 +01:00
David Walker
b09c2f899e Fixed bug #73783 
Bug #73783 raises an issue with signal handling when using SIG_IGN.
With PHP7.1 ZEND_SIGNALS is defaulted to on, which will for all
signals set the handler as zend_signal_handler_defer.  This is
problematic for syscalls like sleep(), which will only return when the
requisite number of seconds have elapsed, or, a non-ignored signal is
raised.  In this case we want to SIG_IGN SIGCHLD, however, SIG_IGN is
only stored in the SIGG(handlers) array, and the actual system level
handler is defined.  This prevents proper signal ignoring when requeted.
 2016-12-29 21:18:22 +01:00
Christoph M. Becker
f4d884dc6e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Revert "Fix #73530: Unsetting result set may reset other result set"
 2016-12-29 13:54:11 +01:00
Christoph M. Becker
88d1a2c5aa Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Revert "Fix #73530: Unsetting result set may reset other result set"

# Conflicts:
#	ext/sqlite3/sqlite3.c
 2016-12-29 13:47:28 +01:00
Christoph M. Becker
2ba3b27594 Revert "Fix #73530: Unsetting result set may reset other result set" 
This reverts commit eb570294a2.

That commit caused a regression, so it's probably best to revert it, and
to tackle the issue for the next minor release.
 2016-12-29 12:59:04 +01:00
Bob Weinand
898e439333 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-22 15:31:39 +01:00
Bob Weinand
8823b68c41 Fixed bug #73373 (deflate_add does not verify that output was not truncated) 2016-12-22 15:29:36 +01:00
Bob Weinand
3b2b080cbc Fixed bug #73704 (phpdbg shows the wrong line in files with shebang) 2016-12-22 00:39:24 +01:00
Nikita Popov
9afc61c214 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-21 21:19:10 +01:00
David Walker
5733fd1caf Fix #73753 - Unpacked Arrays and Duplication 2016-12-21 21:18:20 +01:00
Bob Weinand
8b06b7e266 Fixed bug #73794 (Crash (out of memory) when using run and # command separator) 2016-12-20 20:18:36 +01:00
Dmitry Stogov
43cc3d7d92 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73792 (invalid foreach loop hangs script)
 2016-12-20 16:53:06 +03:00
Dmitry Stogov
3c6a2fb08c Fixed bug #73792 (invalid foreach loop hangs script) 2016-12-20 16:48:57 +03:00
Xinchen Hui
6bd41a1d47 Fixed bug #73789 (Strange behavior of class constants in switch/case block) 2016-12-20 21:01:21 +08:00
Anatol Belski
7ef2e90197 update NEWS 2016-12-19 01:08:19 +01:00
Anatol Belski
9fb8ea58b5 update NEWS 2016-12-19 01:07:08 +01:00
Nikita Popov
c1af9f282f Fix bug #46103 2016-12-18 17:10:19 +01:00
Anatol Belski
e8512ed7db update NEWS 2016-12-18 01:03:00 +01:00
Xinchen Hui
7cef66c635 Fixed bug #73746 (Method that returns string returns UNKNOWN:0 instead) 2016-12-16 11:06:27 +08:00
Nikita Popov
2f438342ec Fixed bug #73727 
Error introduced when refactoring zend_alloc code into zend_bitset.
 2016-12-14 17:56:31 +01:00
Andrey Hristov
9eca4dca73 Optimized memory handling of BIT fields. Less memory copies and less 
memory usage.
 2016-12-12 21:59:29 +02:00
Andrey Hristov
e15c418c4c Fix off by 1 problem. 
The problem was manifestated only with BIT columns and only when more than
one row was fetched. The problem was coming from the fact that in pre-7.0
times mysqlnd was using a no-copy optimization. This optimization kept the
strings (and also the BIT mask equivalents as strings) in the packet and the
zval referred to them. 7.0+ zvals cannot use no-copy and always copy. Because
of this the allocated memory for the packet was reduced by 1 by the person who
ported the driver, but the starting address of the bit area wasn't reduced.
Because of this the bit_area started at wrong address and the length decoded
wrong.
 2016-12-12 21:11:02 +02:00
Anatol Belski
ae91cfacdb update NEWS 2016-12-11 17:40:22 +01:00
Anatol Belski
ee2625e252 update NEWS 2016-12-11 17:39:08 +01:00
Xinchen Hui
4eb4ec2cb1 Update NEWS 2016-12-09 22:39:42 +08:00