clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,022 Commits 491 Branches 1,363 Tags 836 MiB
379f4c0ceb
Commit Graph

78022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
379f4c0ceb support for Visual C+ 2013 2014-01-20 10:04:20 +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
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
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
12c1cfbf8f fix C89 compat 2014-01-19 02:05:10 +01: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
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
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
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
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
03386d1786 Clarify always_populate_raw_post_data situation in 5.6 2014-01-17 12:18:16 +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
Gernot Vormayr
f6d137a716 Add apparmor change hat functionality to fpm 2014-01-17 12:48:33 +04:00
Yasuo Ohgaki
b070f1080b Update NEWS 2014-01-17 12:34:23 +09:00
Anatol Belski
8b703e9ee0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  forked the test for bug #66481
 2014-01-17 03:32:06 +01:00
Anatol Belski
14e371e7d4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  forked the test for bug #66481
 2014-01-17 03:31:38 +01:00
Anatol Belski
a218a8b917 forked the test for bug #66481 2014-01-17 03:30:42 +01:00
krakjoe
837bd24dea fix #50 2014-01-16 20:10:30 +00:00
Xinchen Hui
bfcdd67865 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-16 14:42:04 +08:00
Xinchen Hui
9799816e0c Merge branch 'PHP-5.4' into PHP-5.5 2014-01-16 14:41:52 +08:00
Xinchen Hui
b777248ded Re-fixed Bug #66481 (Calls to session_name() segfault when session.name is null) 2014-01-16 14:41:12 +08:00
Xinchen Hui
271053ad47 Revert "Bug #66481 Segfaults on session_name()" 
This reverts commit 5662ffb295.
 2014-01-16 14:38:35 +08:00
Xinchen Hui
57cf8eaccd Revert "Update NEWS" 
This reverts commit 8f5de8ddcf.
 2014-01-16 14:38:22 +08:00
Yasuo Ohgaki
ffcff225fd Update NEWS 2014-01-16 11:41:30 +09:00
Yasuo Ohgaki
8f5de8ddcf Update NEWS 2014-01-16 11:40:33 +09:00
Yasuo Ohgaki
518327f7e3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #66481 Segfaults on session_name()
 2014-01-16 11:35:11 +09:00
Yasuo Ohgaki
744f38c2d6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #66481 Segfaults on session_name()
 2014-01-16 11:34:31 +09:00
Conor McDermottroe
5662ffb295 Bug #66481 Segfaults on session_name() 
If the previous value of session.name was NULL then any call to
session_name($string) would result in a segmentation fault.

This changes the behaviour to set the value of session.name to
"PHPSESSID" if a blank value is given in php.ini or via -d on the
command line. There is already protection against setting it to NULL via
session_name() or ini_set().
 2014-01-16 11:33:10 +09:00
Dmitry Stogov
299d893f0a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Log information about cached scripts and keys
 2014-01-15 12:15:25 +04:00
Dmitry Stogov
7359dd6df3 Log information about cached scripts and keys 2014-01-15 12:12:22 +04:00
Dmitry Stogov
77bc5b8bae We don't know PHP_5_6_X_API_NO yet 2014-01-15 11:09:38 +04:00
Yasuo Ohgaki
28be6aea9c Added pg_lo_truncate() and 64bit large object support from PostgreSQL 9.3 and up 2014-01-15 14:37:24 +09:00
Yasuo Ohgaki
c58329fccc Always initialize pg_version() result array elements to prevent failed test with older postgresql servers. Add missing client_encoding element. 2014-01-15 14:27:33 +09:00
Yasuo Ohgaki
d0924c2500 Fixed pg_version() crash with older postgresql 2014-01-15 13:32:15 +09:00
Yasuo Ohgaki
167eaedcbd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed session module is sending multiple set-cookie headers when session.use_strict_mode=1
 2014-01-15 11:07:10 +09:00