clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,312 Commits 491 Branches 1,363 Tags 838 MiB
d3954f16d3
Commit Graph

78312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
d3954f16d3 Use better data structures (incomplete) -- stash for today work 2014-02-12 22:15:08 +08:00
Dmitry Stogov
be82a07776 Use better data structures (incomplete) 2014-02-12 18:08:11 +04:00
Dmitry Stogov
4e66abad54 Use better data structures (incomplete) - refactored return_value handling 2014-02-12 14:29:51 +04:00
Dmitry Stogov
e2ea9a7319 Use better data structures (incomplete) 2014-02-12 11:42:27 +04:00
Xinchen Hui
0c0efba45f Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 2014-02-11 19:33:48 +08:00
Xinchen Hui
3f4c877bf7 Use better data structures (incomplete) 2014-02-11 19:33:18 +08:00
Dmitry Stogov
2161103fc3 Use better data structures (incomplete) 2014-02-10 17:49:21 +04:00
Dmitry Stogov
00244baba8 Use better data structures (incomplete) 2014-02-10 12:18:01 +04:00
Dmitry Stogov
f4cfaf36e2 Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
Anatol Belski
89a9acea1f Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed glob compilation with vc12
 2014-01-20 10:13:22 +01:00
Anatol Belski
8dd44fee08 fixed glob compilation with vc12 2014-01-20 10:11:31 +01:00
Anatol Belski
d501707248 Merge branch 'PHP-5.6' 
* PHP-5.6:
  support for Visual C+ 2013
 2014-01-20 10:05:37 +01:00
Anatol Belski
379f4c0ceb support for Visual C+ 2013 2014-01-20 10:04:20 +01:00
Remi Collet
5b5b9b9239 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Skip readline tests which fail with libedit Add specific libedit test (output slightly differs)
 2014-01-20 09:39:39 +01:00
Remi Collet
0401226d93 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Skip readline tests which fail with libedit Add specific libedit test (output slightly differs)
 2014-01-20 09:39:29 +01:00
Remi Collet
e3192473b5 Skip readline tests which fail with libedit 
Add specific libedit test (output slightly differs)
 2014-01-20 09:38:34 +01:00
Remi Collet
3b82a477b0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed Bug #66412 readline_clear_history() with libedit causes segfault after #65714
 2014-01-20 08:41:04 +01:00
Remi Collet
91513097ca Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed Bug #66412 readline_clear_history() with libedit causes segfault after #65714
 2014-01-20 08:40:39 +01:00
Remi Collet
31d67bd353 Fixed Bug #66412 readline_clear_history() with libedit causes segfault after #65714 
Checking all libedit functions, this check is done in each functions (add_history,
read_history, write_history, ...) but is missing in clear_history.

Test coverage: readline_clear_history_001.phpt
 2014-01-20 08:38:53 +01:00
Yasuo Ohgaki
fd45f1eb78 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
 2014-01-19 13:33:27 +09:00
Yasuo Ohgaki
fb7e25d2e0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
 2014-01-19 13:32:35 +09:00
Yasuo Ohgaki
4e55c6bffb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
 2014-01-19 13:31:50 +09:00
Yasuo Ohgaki
e769c96a11 Enable zend.multibyte tests. Tipcal configuration works, but most tests fail. 2014-01-19 13:29:45 +09:00
Anatol Belski
d788a85736 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix C89 compat
 2014-01-19 02:05:38 +01:00
Anatol Belski
12c1cfbf8f fix C89 compat 2014-01-19 02:05:10 +01:00
Will Fitch
9eb4bc2f84 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix #62479: Some chars not parsed in passwords
 2014-01-18 19:49:06 -05:00
Will Fitch
fb2091b1d4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix #62479: Some chars not parsed in passwords
 2014-01-18 19:41:45 -05:00
Will Fitch
98907a96f9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix #62479: Some chars not parsed in passwords
 2014-01-18 19:40:54 -05:00
Will Fitch
da83b513b2 Fix #62479: Some chars not parsed in passwords 
This fixes an issue where backslashes and spaces aren't
correctly parsed for passwords.
 2014-01-18 19:27:40 -05:00
Will Fitch
4e5195f82c Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #66509: copy() arginfo incorrect since 5.4
 2014-01-18 11:57:34 -05:00
Will Fitch
a540c57331 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #66509: copy() arginfo incorrect since 5.4
 2014-01-18 11:56:22 -05:00
Will Fitch
767e6d2e08 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #66509: copy() arginfo incorrect since 5.4

Conflicts:
	NEWS
 2014-01-18 11:39:32 -05:00
Will Fitch
5b906ce6eb Fix bug #66509: copy() arginfo incorrect since 5.4 
Since 5.4, the ZEND_BEGIN_ARG_INFO_EX was replaced
by non _EX, causing Reflection to assume the
$context parameter is required.
 2014-01-18 11:25:53 -05:00
Nikita Popov
89eab884d9 Merge branch 'PHP-5.6' 2014-01-18 14:44:57 +01:00
Nikita Popov
31a2ac470c Fix argument unpacking across stack pages 
If multiple unpacks were used (or mixed with normal arguments)
parts of the arguments could land on different stack pages. If
this occurs the arguments will now be copied to a new stack page.

The code used to do this is copied verbatim from the PHP 5.4 branch
and only modified to reduce the amount of inlined code.
 2014-01-18 14:41:33 +01:00
Johannes Schlüter
84efb8fc71 Merge branch 'PHP-5.6' 2014-01-18 13:53:15 +01:00
Johannes Schlüter
8ff4d61f08 Merge branch 'phpdbg' into PHP-5.6 2014-01-18 13:52:27 +01:00
krakjoe
c205a6f3de zts fix 2014-01-17 21:20:19 +00:00
krakjoe
18f31d474e ... 2014-01-17 21:15:03 +00:00
krakjoe
54fa2883f0 remove goto from zend_try/zend_end_try/zend_catch blocks 2014-01-17 21:08:35 +00:00
Adam Harvey
86096a99ec Merge branch 'PHP-5.6' 2014-01-17 20:29:31 +08:00
Adam Harvey
43a8f4f814 Add a couple of missing items to UPGRADING. 
Usual grumble about please ensuring UPGRADING gets updated goes here. :)
 2014-01-17 20:28:49 +08:00
Michael Wallner
f1fc5a5bf5 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Clarify always_populate_raw_post_data situation in 5.6
 2014-01-17 12:19:17 +01:00
Michael Wallner
03386d1786 Clarify always_populate_raw_post_data situation in 5.6 2014-01-17 12:18:16 +01:00
Anatol Belski
deb56c010e Merge branch 'PHP-5.6' 2014-01-17 11:08:21 +01:00
Anatol Belski
b58dbefba0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  added appropriate exception handling flag to ext\intl
  Update NEWS
 2014-01-17 11:08:02 +01:00
Anatol Belski
7f0aff52cf added appropriate exception handling flag to ext\intl 
According to the doc page
http://msdn.microsoft.com/en-us/library/1deeycx5.aspx
it's appropriate as none of the extern C functions do throw
exceptions. This also fixes the warning C4530.
 2014-01-17 11:03:40 +01:00
Antony Dovgal
98e6c8ca2d fix indentation 2014-01-17 12:49:21 +04:00
Gernot Vormayr
dff0d51243 Add some basic and apparmor tests to fpm 2014-01-17 12:49:07 +04:00
Gernot Vormayr
e3d3283405 Add --force-stderr to fpm 2014-01-17 12:49:00 +04:00