archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 23:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
99637 commits 526 branches 1434 tags 877 MiB
Commit graph

99637 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joe Watkins
ae6fc21f14 Merge branch 'pull-request/2158' 2016-10-17 14:46:03 +01:00
Joe Watkins
a5251f78f8 Merge branch 'master' of git.php.net:/php-src 2016-10-17 14:44:11 +01:00
Joe Watkins
f756c5ea22 news entry for pr #2158 2016-10-17 14:43:41 +01:00
Joe Watkins
c9c3d9e764 Merge branch 'pull-request/2158' 2016-10-17 14:42:35 +01:00
Joe Watkins
6091873d4a Revert "Fixed bug #73067 (__debugInfo crashes when throwing an exception)" 
This reverts commit 2d8ab51576.
 2016-10-17 14:22:55 +01:00
Joe Watkins
5fa76095bb Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1 2016-10-17 14:12:15 +01:00
Joe Watkins
fe02227524 sync news from 7.1.0RC4 2016-10-17 14:11:39 +01:00
Remi Collet
90dcef8f45 Merge branch 'PHP-7.1' 
* PHP-7.1:
  also fix 32bits test for microsecond
  bump news version
  Update 7.1 NEWS for bug #71148
 2016-10-17 15:08:15 +02:00
Remi Collet
0820c94382 also fix 32bits test for microsecond 2016-10-17 15:07:56 +02:00
Joe Watkins
6766a985eb bump news version 2016-10-17 11:31:34 +01:00
Christoph M. Becker
0f49aa3287 Merge branch 'pull-request/2151' 2016-10-17 10:37:38 +02:00
Christopher Jones
72041580bd Update 7.1 NEWS for bug #71148 2016-10-17 12:52:34 +11:00
Christopher Jones
abd2c049a2 Merge branch 'PHP-7.1' 2016-10-17 12:42:44 +11:00
Christopher Jones
23e2c356b7 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-17 12:40:54 +11:00
Christopher Jones
8be59a1301 Fixed bug #71148 (Bind reference overwritten on PHP 7) 2016-10-17 12:40:14 +11:00
Bob Weinand
efcbeb0603 Merge branch 'PHP-7.1' 2016-10-16 15:46:44 +02:00
Bob Weinand
f8c2089651 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-16 15:46:33 +02:00
Bob Weinand
d82da7de3a Fixed bug #71234 (INI files are loaded even invoked as phpdbg -n --version) 2016-10-16 15:41:37 +02:00
Bob Weinand
b1c6299b34 Merge branch 'PHP-7.1' 2016-10-16 13:48:25 +02:00
Bob Weinand
47bd3d982e Merge branch 'PHP-7.0' into PHP-7.1 2016-10-16 13:48:13 +02:00
Bob Weinand
e93eaee164 Fixed bug #70776 (Simple SIGINT does not have any effect) 2016-10-16 13:47:49 +02:00
Bob Weinand
0399a43265 Merge branch 'PHP-7.1' 2016-10-16 12:34:20 +02:00
Bob Weinand
601ab6e9d0 Fix searching for catch blocks 
Since PHP-7.1 catch blocks are addressed with relative byte difference between two catch blocks as opposed to absolute opcode number
 2016-10-16 12:34:10 +02:00
Kalle Sommer Nielsen
ba76edcc7c Remove this old and long gone deprecated makefile. Netware was discontinued over 7 years ago and it is safe to say that no one is really maintaining support in php-src anyway for it 2016-10-16 08:52:39 +02:00
Kalle Sommer Nielsen
e63c864609 Fix build, decls first 2016-10-16 06:36:54 +02:00
Kalle Sommer Nielsen
5c169af7c9 Change the semantics of proc_nice() for Windows to better match the values of the wmic output 2016-10-16 05:21:30 +02:00
Kalle Sommer Nielsen
64945e9387 Implemented proc_nice() for Windows (FR #49806) 
The core implementation details are described in win32/nice.c for values sent to proc_nice(), these can however be discussed to maybe comply with those of wmic, Anatol, thoughts?

The test supplied uses wmic for testing the functionality, it could potentially fail on systems where either wmic is not available or the system language is not english (as Microsoft tends to translate even CLI programs).
 2016-10-16 04:17:35 +02:00
Kalle Sommer Nielsen
2dbddf2241 Remove the old and way outdated Zend/RFCs folder, we use the wiki nowadays anyway 2016-10-16 01:42:53 +02:00
Kalle Sommer Nielsen
796dd639cb Fix build + warning, decls first 2016-10-16 01:01:09 +02:00
Yasuo Ohgaki
7cb1be2ecd Use proper API 2016-10-16 07:29:33 +09:00
Nikita Popov
f58701fe6f Merge branch 'PHP-7.1' 2016-10-16 00:04:23 +02:00
Nikita Popov
9f472ba5e3 Various function info fixes 2016-10-15 23:58:31 +02:00
Nikita Popov
659cc278e2 Various RC inference fixes 2016-10-15 23:58:29 +02:00
Nikita Popov
1903fc6298 Fix SplFixedArray::offsetGet() invocation for NULL offset 2016-10-15 23:58:28 +02:00
Nikita Popov
b1fc1fb937 Normalize preg_replace_callback() return value 
One particular error case was returning the argument without
casting to string.
 2016-10-15 23:58:26 +02:00
Christoph M. Becker
8f299a9673 Merge branch 'PHP-7.1' 2016-10-15 19:46:32 +02:00
Christoph M. Becker
663491b9ba Update to SQLite 3.15.0 2016-10-15 19:46:00 +02:00
Yasuo Ohgaki
2bd34885da Add tests 2016-10-15 21:03:14 +09:00
Yasuo Ohgaki
06b20d973a Fix test and cleanup code a little 2016-10-15 20:51:34 +09:00
Yasuo Ohgaki
4af00876f6 mb_check_encoding()/mb_convert_encoding() - Improve and add recursion detection. 2016-10-15 16:52:17 +09:00
Anatol Belski
c23eeaee79 Merge branch 'PHP-7.1' 
* PHP-7.1:
  sync NEWS
 2016-10-14 19:53:23 +02:00
Anatol Belski
3d7cd272ef Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  sync NEWS
 2016-10-14 19:52:52 +02:00
Anatol Belski
6d91772c2f sync NEWS 2016-10-14 19:52:04 +02:00
Remi Collet
298a79e082 Merge branch 'PHP-7.1' 
* PHP-7.1:
  bump ext/zip version
 2016-10-14 17:31:43 +02:00
Remi Collet
20b1029e4c Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  bump ext/zip version
 2016-10-14 17:31:26 +02:00
Remi Collet
f1cf340e19 bump ext/zip version 2016-10-14 17:31:07 +02:00
Christoph M. Becker
dd35ba08ef Merge branch 'PHP-7.1' 2016-10-14 14:15:31 +02:00
Christoph M. Becker
2cc3aeb4b9 Implement #72918: negative offset inside a quoted string leads to parse error 
We allow negative numeric offsets for the simple syntax inside
double-quoted and heredoc strings.
 2016-10-14 14:14:08 +02:00
Christoph M. Becker
0cb6cc4309 Merge branch 'PHP-7.1' 2016-10-14 13:52:44 +02:00
Christoph M. Becker
6e3ab61fa5 Update NEWS 
This entry has been lost due to a bad merge.
 2016-10-14 13:52:21 +02:00