mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 18:34:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
92,713 Commits 500 Branches 1,381 Tags 797 MiB
e029a86aad
Commit Graph

92713 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nuno Lopes
0e069fa57d exclude datelib from coverage report as asked by Derick 2015-10-24 17:38:20 -04:00
Nuno Lopes
87498c5c39 exclude datelib from coverage report as asked by Derick 2015-10-24 17:37:00 -04:00
Nikita Popov
b9cc3176eb Fix bug #70782 2015-10-24 23:19:02 +02:00
Anatol Belski
aae108c1ce Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix globals initialization in sapi/cgi
 2015-10-23 13:59:27 +02:00
Anatol Belski
22af88274b Fix globals initialization in sapi/cgi 
Basically backport 8430ec17
 2015-10-23 13:56:40 +02:00
Anatol Belski
448d1ce428 rather use the supplied inttypes.h with vc14 2015-10-23 09:47:00 +02:00
Anatol Belski
5ba763413b fix test redirection when run not from source root 2015-10-23 09:42:19 +02:00
Xinchen Hui
95446b4416 Indents 2015-10-23 11:19:30 +08:00
c9s
bbaf6daa9d Fix boolean conversion warnings 
Summary:

The compiler complains and raised some warnings about boolean
conversion:

    warning: address of 'ce->constants_table' will always evaluate to
    'true' [-Wpointer-bool-conversion]

Since the address of 'HashTable' will always evaluate to true. the
condition should be removed. The scope is kept for local variables.

Platform:

    OS X 10.11

Compiler:

    Apple LLVM version 7.0.0 (clang-700.0.72)
    Target: x86_64-apple-darwin15.0.0
    Thread model: posix
 2015-10-23 11:19:19 +08:00
Andrey Hristov
3dc0bf7428 Merge branch 'PHP-5.6' into PHP-7.0 2015-10-22 11:50:12 +02:00
Andrey Hristov
afd31489d0 Improve fix for Bug #68344 MySQLi does not provide way to disable peer certificate validation 2015-10-22 11:48:53 +02:00
Andrey Hristov
8f9b2b68ee Merge branch 'PHP-5.6' into PHP-7.0 2015-10-21 15:52:38 +02:00
Andrey Hristov
8292260515 Fix for Bug #68344 MySQLi does not provide way to disable peer certificate validation 2015-10-21 15:10:24 +02:00
Andrey Hristov
efd2b3f5f2 Update the certificates needed for the mysqli tests 2015-10-21 10:42:51 +02:00
Bob Weinand
2ef327caed Exempt paging from -qrr mode 2015-10-20 21:56:00 +02:00
Anatol Belski
1149833a58 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  backport 262160e and 2d55e8c into 5.6
 2015-10-20 20:07:14 +02:00
Anatol Belski
ccc95bf9df backport 262160e and 2d55e8c into 5.6 2015-10-20 20:05:44 +02:00
Xinchen Hui
6ad2c3eb33 Revert "Ensure proper exception handling and EX(opline) state in USER_OPCODE handler" 
read: http://news.php.net/php.internals/88887

This reverts commit 808f62bb4d.
 2015-10-20 08:12:04 -07:00
Xinchen Hui
673ad62eed Regenerate zend_ini_scanner.c 2015-10-20 16:58:30 +08:00
Xinchen Hui
a5a5c3e09a Update NEWS 2015-10-20 13:26:40 +08:00
Xinchen Hui
c7cb40353c Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	Zend/zend_ini_scanner.c
 2015-10-20 13:26:02 +08:00
Xinchen Hui
d5f76caf6c Fixed bug #70748 (Segfault in ini_lex () at Zend/zend_ini_scanner.l) 2015-10-20 13:20:56 +08:00
Ferenc Kovacs
131a348d37 remove imap tests for now until I finish the sudoless dovecot config 2015-10-19 23:57:43 +02:00
Ferenc Kovacs
fa0ffa4777 remove imap tests for now until I finish the sudoless dovecot config 2015-10-19 23:43:26 +02:00
Ferenc Kovacs
03e1e88db1 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fixup, both catched by nikic
  use another character device in this test as /dev/console seems that it is different for lxc containers
  the de_DE(iso-8859-1) locale is not available on ubuntu by default, but there is no reason to require that over the utf-8 one
  let's try running our testsuite without sudo
 2015-10-19 23:02:52 +02:00
Ferenc Kovacs
395ef4efb7 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixup, both catched by nikic
  use another character device in this test as /dev/console seems that it is different for lxc containers
  the de_DE(iso-8859-1) locale is not available on ubuntu by default, but there is no reason to require that over the utf-8 one
  let's try running our testsuite without sudo
 2015-10-19 22:47:23 +02:00
Ferenc Kovacs
f3838a9c35 Merge branch 'pr-1483' into PHP-5.5 
* pr-1483:
  fixup, both catched by nikic
  use another character device in this test as /dev/console seems that it is different for lxc containers
  the de_DE(iso-8859-1) locale is not available on ubuntu by default, but there is no reason to require that over the utf-8 one
  let's try running our testsuite without sudo
 2015-10-19 22:44:19 +02:00
Stanislav Malyshev
26e5429f72 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #64172
  Bug #70561: Fix DirectoryIterator to throw OutOfBoundsException

Conflicts:
	ext/pdo/pdo_dbh.c
 2015-10-18 17:20:00 -07:00
Stanislav Malyshev
0b35e0c5a1 Merge branch 'pull-request/1535' into PHP-5.6 
* pull-request/1535:
  Bug #70561: Fix DirectoryIterator to throw OutOfBoundsException
 2015-10-18 17:17:55 -07:00
Daniel Persson
73384728ca Fix bug #64172 
Check if the SQLSTATE error code is equal to PDO_ERR_NONE before we ask the driver.
And if no error is reported skip the extra call to the driver.
 2015-10-18 17:06:54 -07:00
Daniel Persson
307c1f6bf0 Fix bug #64172 
Check if the SQLSTATE error code is equal to PDO_ERR_NONE before we ask the driver.
And if no error is reported skip the extra call to the driver.
 2015-10-18 17:03:39 -07:00
Stanislav Malyshev
c7c6df6cec Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Skip some tests for platforms different than x86
 2015-10-18 15:45:40 -07:00
Fábio Perez
c76fd640e6 Skip some tests for platforms different than x86 
These tests are verifying undefined behaviour such as shifting by more than 63
bits and by negative numbers.
 2015-10-18 15:45:25 -07:00
Stanislav Malyshev
5f759b04b8 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Skip serialize test if ext/session is not loaded

Conflicts:
	ext/standard/tests/serialize/bug70219_1.phpt
 2015-10-18 15:44:59 -07:00
Stanislav Malyshev
b94f67885c Skip serialize test if ext/session is not loaded 2015-10-18 15:43:03 -07:00
Stanislav Malyshev
6a4803026d Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Remove wrong argument $session from SNMP::setSecurity()
  Fix SNMP::setSecurity() arginfo (Fixes bug #70476)
 2015-10-18 14:51:13 -07:00
jubianchi
718445b096 Remove wrong argument $session from SNMP::setSecurity() 2015-10-18 14:48:39 -07:00
jubianchi
39a2514643 Fix SNMP::setSecurity() arginfo (Fixes bug #70476) 2015-10-18 14:48:25 -07:00
Felipe Pena
f231ddddaf - Implemented output paging 2015-10-18 12:08:04 -02:00
Anatol Belski
daddb7a832 updated NEWS 2015-10-18 11:36:04 +02:00
Anatol Belski
dc241566aa Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  update NEWS
 2015-10-18 11:35:25 +02:00
Anatol Belski
9501293de7 update NEWS 2015-10-18 11:34:42 +02:00
Anatol Belski
af8937c056 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  C89 compat
  use spprintf instead (no need to estrdup afterwards).
  dblib's dbcolname can return null in some cases
  testcase fot bug #69757
  Segmentation fault on pdo_dblib::nextRowset (bug #69757)

Conflicts:
	ext/pdo_dblib/dblib_stmt.c
 2015-10-18 11:28:57 +02:00
Anatol Belski
7f33ab834d C89 compat 2015-10-18 11:14:30 +02:00
MiRacLe.RPZ
2b5af600e3 use spprintf instead (no need to estrdup afterwards). 2015-10-18 11:10:50 +02:00
MiRacLe.RPZ
5c19355095 dblib's dbcolname can return null in some cases 2015-10-18 11:10:45 +02:00
MiRacLe.RPZ
4c8f064d7d testcase fot bug #69757 2015-10-18 11:10:39 +02:00
MiRacLe.RPZ
acb2368976 Segmentation fault on pdo_dblib::nextRowset (bug #69757) 2015-10-18 11:10:34 +02:00
Aaron Piotrowski
c100a742dc Fix missed assertion tests 2015-10-18 02:23:43 -05:00
Aaron Piotrowski
49d6336fae Always return boolean from assert 
Matches docs prototype
 2015-10-18 01:42:15 -05:00