php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-22 15:38:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
81,114 Commits 549 Branches 1,485 Tags
0854fd8b8114faa5bc4fa1736292525a5ecdea8b
Commit Graph

81114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski 0854fd8b81 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed test
 2014-12-06 12:31:55 +01:00
Anatol Belski 5d126245a3 fixed test 2014-12-06 12:31:27 +01:00
Anatol Belski 08241ee3f3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  C89 compat
  add include for missing localeconv_r proto
 2014-12-06 12:18:05 +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 8d79139980 updated NEWS 2014-12-06 12:00:39 +01:00
Anatol Belski ebaf130a15 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #65230 setting locale randomly broken
 2014-12-06 12:00:17 +01:00
Anatol Belski 1b4d5ad46a Fixed bug #65230 setting locale randomly broken 2014-12-06 11:59:43 +01:00
Matteo Beccati b120f9beb2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix compilation error (ref #68424)
 2014-12-06 10:24:27 +01:00
Matteo Beccati 625b929c6e Fix compilation error (ref #68424) 2014-12-06 10:23:56 +01:00
Adam Harvey 381fd62ccf Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Revert unintentional docblock change
 2014-12-05 13:58:19 -08: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 0e67973e9a Updated NEWS 2014-12-05 17:06:16 +01:00
Julien Pauli 5104c2bbc3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS
  Start adding new attribute to control multi statements
 2014-12-05 17:05:37 +01: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 a3e4b889e7 updated NEWS 2014-12-05 15:51:26 +01:00
Anatol Belski 297f582f5c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  . Fixed bug #68120 Update bundled libsqlite

Conflicts:
	ext/sqlite3/libsqlite/sqlite3.c
 2014-12-05 15:50:18 +01:00
Anatol Belski fccd1eda5f . Fixed bug #68120 Update bundled libsqlite 2014-12-05 15:43:53 +01:00
Anatol Belski 0e09e5e6fa Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #65769 localeconv() broken in TS builds
 2014-12-05 11:08:55 +01:00
Anatol Belski fa863c9ea3 updated NEWS 2014-12-05 11:08:32 +01:00
Anatol Belski 7943f944c2 Fixed bug #65769 localeconv() broken in TS builds 2014-12-05 11:06:06 +01:00
Julien Pauli cb9cc6b8e1 Updated NEWS 2014-12-05 10:12:35 +01:00
Julien Pauli ee709c5366 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS
  Fixed #68479 - Added escape parameter to SplFileObject::fputcsv
 2014-12-05 10:12:08 +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 6cf5ac7567 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix dir separators in test
 2014-12-05 07:08:35 +01:00
Anatol Belski c65143d571 fix dir separators in test 2014-12-05 07:07:58 +01:00
Ferenc Kovacs 9c5d84ace1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  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:32 +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 52b41f24e3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed #65213 - cannot cast SplFileInfo to boolean
 2014-12-04 07:21:13 +08: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 5deac25ea0 updated NEWS 2014-12-03 16:48:49 +01:00
Anatol Belski f3b4c05423 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  Fixed bug #55541 errors spawn MessageBox, which blocks test automation
 2014-12-03 16:48:07 +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
Dmitry Stogov cd68c4b1d2 Fixed __debugInfo() support 2014-12-03 12:13:01 +03:00
Adam Harvey e346608209 Update UPGRADING for the new variadic functions, and re-sort. 2014-12-02 16:47:31 -08:00
Ferenc Kovacs d81b7c4450 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  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:19:16 +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
Remi Collet 196b768928 NEWS 2014-12-02 08:40:52 +01:00
Remi Collet 6f3714a8fc Fix Bug #68536 Pack for 64bits integer is broken on bigendian. 
Covered by ext/standard/tests/strings/pack64.phpt
 2014-12-02 08:38:39 +01:00
Anatol Belski c45fcfd063 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  one more refix to the test
 2014-12-01 19:10:18 +01:00
Anatol Belski a0c03a3ec5 one more refix to the test 2014-12-01 19:09:39 +01:00
Anatol Belski fe4a5abf30 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix dir separator in test
 2014-12-01 18:55:52 +01:00