Commit Graph

76482 Commits

Author SHA1 Message Date
Julien Pauli
a67a5dc0ad Updated NEWS 2014-12-10 11:22:28 +01:00
Derick Rethans
4078c35939 Merge branch 'day-of-week-issues' into PHP-5.5 2014-12-08 11:06:41 +00:00
Derick Rethans
5f9a68d3ef Fixed day_of_week function as it could sometimes return negative values internally. 2014-12-08 11:06:12 +00:00
Dmitry Stogov
e6ad29ae96 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed possible read after end of buffer and use after free.
2014-12-08 12:20:01 +03:00
Dmitry Stogov
dd791cd717 Fixed possible read after end of buffer and use after free. 2014-12-08 12:18:27 +03:00
Anatol Belski
5d126245a3 fixed test 2014-12-06 12:31:27 +01:00
Anatol Belski
9016018ccc C89 compat 2014-12-06 12:14:17 +01:00
Anatol Belski
373aa7c81f add include for missing localeconv_r proto 2014-12-06 12:09:35 +01:00
Anatol Belski
1b4d5ad46a Fixed bug #65230 setting locale randomly broken 2014-12-06 11:59:43 +01:00
Matteo Beccati
625b929c6e Fix compilation error (ref #68424) 2014-12-06 10:23:56 +01:00
Adam Harvey
79131b4617 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Revert unintentional docblock change
2014-12-05 13:57:46 -08:00
Chris Christoff
0e985d3726 Revert unintentional docblock change
Revert unintentional docblock change

It looks like commit dd8e59da8f
introduced an unintended docbloc change. I have reverted this
change in this commit.
2014-12-05 13:57:03 -08:00
Julien Pauli
3add3491b3 Updated NEWS 2014-12-05 17:05:21 +01:00
pwolanin
4c0bd5e77a Start adding new attribute to control multi statements 2014-12-05 17:03:31 +01:00
Anatol Belski
fccd1eda5f . Fixed bug #68120 Update bundled libsqlite 2014-12-05 15:43:53 +01:00
Anatol Belski
7943f944c2 Fixed bug #65769 localeconv() broken in TS builds 2014-12-05 11:06:06 +01:00
Julien Pauli
1e40b0aff6 Updated NEWS 2014-12-05 10:11:49 +01:00
Peter Cowburn
557026301f Fixed #68479 - Added escape parameter to SplFileObject::fputcsv 2014-12-05 10:10:10 +01:00
Anatol Belski
c65143d571 fix dir separators in test 2014-12-05 07:07:58 +01:00
Ferenc Kovacs
4f9f7c7948 Merge branch 'pull-request/932' into PHP-5.5
* pull-request/932:
  add initial install
  switch to C travis project instead of PHP
  use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/)
2014-12-04 11:12:17 +01:00
Tjerk Meesters
2bcf8a6cd9 Fixed #65213 - cannot cast SplFileInfo to boolean 2014-12-04 07:17:33 +08:00
Ferenc Kovacs
a8b49bbf18 add initial install 2014-12-04 00:13:38 +01:00
Ferenc Kovacs
b0f7a46b21 switch to C travis project instead of PHP 2014-12-04 00:08:04 +01:00
Ferenc Kovacs
43c36bdb73 use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/) 2014-12-04 00:07:32 +01:00
Anatol Belski
13aaba40cd updated NEWS 2014-12-03 16:47:38 +01:00
Anatol Belski
65fce7f950 Fixed bug #55541 errors spawn MessageBox, which blocks test automation
With that, also fixed bug #68297 (Application Popup provides too few
information) as a better error message is provided to the event log.

In the second case, the condition for display_startup_error was removed. The
condition was added as a fix for bug #30760 which was preventing the
MessageBox to appear. When display_startup_error=on, the error will be seen
on the console. But when running under a webserver it'll probably get lost,
so we need to log it other way into the event log (would be done automatically
when message box was used, but that would eventually cause issues of blocked
execution).

Generally speaking - any MessageBox or other graphical element is a potential
issue and that was repeatedly reported. Graphical elements shouldn't be used
in the core. Even being a rare one it can cause a bad situation where the
server is blocked. Yet some places have to cleaned up.
2014-12-03 16:33:05 +01:00
Ferenc Kovacs
4d743eee5f Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  make sure that we don't truncate the stack trace and cause false test failures when the test is executed in a directory with long path

Conflicts:
	run-tests.php
2014-12-02 19:18:57 +01:00
Ferenc Kovacs
b28c3eb47e make sure that we don't truncate the stack trace and cause false test failures when the test is executed in a directory with long path 2014-12-02 19:17:58 +01:00
Anatol Belski
a0c03a3ec5 one more refix to the test 2014-12-01 19:09:39 +01:00
Anatol Belski
b6d624e54e fix dir separator in test 2014-12-01 18:55:20 +01:00
Anatol Belski
cb6dea6ea8 fix possible null pointer math 2014-12-01 14:40:35 +01:00
Ferenc Kovacs
a3a0e49586 Revert "don't try to send in the test results until we restored qa.php.net" as qa.php.net is back.
This reverts commit 5515937073.
2014-12-01 10:12:06 +01:00
Anatol Belski
c1ec815fae add include for missing usleep proto 2014-12-01 08:27:46 +01:00
Anatol Belski
f4a0e601ee C89 compat 2014-12-01 08:24:44 +01:00
Tjerk Meesters
85e2e6c1fd Added more useful warning messages 2014-11-30 22:39:25 -08:00
Tjerk Meesters
977d84490b Changed based on comments and make its behaviour equal to the Windows version 2014-11-30 22:39:18 -08:00
Tjerk Meesters
7b44790db5 Fix #53092 - dns_get_record does not return false on dns server failure 2014-11-30 22:39:09 -08:00
nil0x42
a87300241f Fix php cli (-S option) inconsistent port parsing
Add port range verification of listening port with -S option for the php cli.
This fixes inconsistent listening port due to unverified cast from long to short
with htons(3).
2014-11-30 22:29:24 -08:00
Stanislav Malyshev
f75da60b18 update NEWS 2014-11-30 22:19:24 -08:00
Jille Timmermans
1b4368db77 Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set) 2014-11-30 22:18:22 -08:00
Jille Timmermans
7049d3450e Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set) 2014-11-30 22:18:12 -08:00
Stanislav Malyshev
f7eedbe9a6 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  update news

Conflicts:
	ext/standard/crypt.c
2014-11-30 21:38:30 -08:00
Stanislav Malyshev
84be568366 update news 2014-11-30 21:37:39 -08:00
Stanislav Malyshev
3003793480 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  update news
  Apply error-code-salt fix to Windows too
  Bug fixes in light of failing bcrypt tests
  Add tests from 1.3. Add missing tests.
  Upgrade crypt_blowfish to version 1.3
2014-11-30 21:12:17 -08:00
Stanislav Malyshev
39007e23a4 update news 2014-11-30 21:12:03 -08:00
Stanislav Malyshev
4d162a2d9b update NEWS 2014-11-30 21:11:20 -08:00
Stanislav Malyshev
abf5b9481b Merge branch 'pull-request/868' into PHP-5.5
* pull-request/868:
  Apply error-code-salt fix to Windows too
  Bug fixes in light of failing bcrypt tests
  Add tests from 1.3. Add missing tests.
  Upgrade crypt_blowfish to version 1.3
2014-11-30 21:09:41 -08:00
Leigh
301b7f990a Apply error-code-salt fix to Windows too
Conflicts:
	ext/standard/crypt.c
2014-11-30 21:07:31 -08:00
Leigh
7e870c596d Bug fixes in light of failing bcrypt tests
Conflicts:
	ext/standard/crypt.c
2014-11-30 21:06:39 -08:00
Leigh
2d9d10fbbf Add tests from 1.3. Add missing tests.
3 of the missing tests fail. // TODO
2014-11-30 21:05:40 -08:00