mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-04 07:14:10 +08:00
Code Issues Packages Projects Releases Wiki Activity
70,371 Commits 503 Branches 1,384 Tags 832 MiB
c4d0b796c2
Commit Graph

70371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
c4d0b796c2 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix test failed,  the fsockopen will be refused immediately if the server is not set up.
  - BFN
 2012-05-09 11:23:37 +08:00
Xinchen Hui
7b2ab56997 Fix test failed, the fsockopen will be refused immediately if the server is not set up. 2012-05-09 11:21:24 +08:00
Felipe Pena
f46a064760 - BFN 2012-05-08 21:07:29 -03:00
Felipe Pena
4dc9545aaa Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #61978 (Object recursion not detected for classes that implement JsonSerializable)
 2012-05-08 21:06:15 -03:00
Felipe Pena
92bc49b2b0 - Fixed bug #61978 (Object recursion not detected for classes that implement JsonSerializable) 2012-05-08 21:05:51 -03:00
David Soria Parra
e67567088e Merge branch 'PHP-5.4' 
* PHP-5.4:
  Typo
 2012-05-08 22:09:13 +02:00
David Soria Parra
2cb0ed1328 Typo 2012-05-08 22:08:54 +02:00
Anatoliy Belsky
5fce7fe885 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*
 2012-05-08 19:36:15 +02:00
Anatoliy Belsky
87fa84abde Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*
 2012-05-08 19:35:13 +02:00
Matt Ficken
c12fdbde5f Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/* 
Fixed that again for systems having their %SYSTEMROOT% not in
c:\windows
 2012-05-08 19:31:41 +02:00
Stanislav Malyshev
08779069e8 Merge branch 'PHP-5.4' 
* PHP-5.4:
  c++ comments
  restore BC
  ws + restore BC to apache_request_headers
  fix bug #61807 - Buffer Overflow in apache_request_headers
 2012-05-08 10:21:10 -07:00
Stanislav Malyshev
057f4719d3 c++ comments 2012-05-08 10:19:24 -07:00
Stanislav Malyshev
1919ec5a55 restore BC 2012-05-08 10:19:24 -07:00
Stanislav Malyshev
bd8912e47c ws + restore BC to apache_request_headers 2012-05-08 10:19:23 -07:00
Stanislav Malyshev
20364bcff9 fix bug #61807 - Buffer Overflow in apache_request_headers 2012-05-08 10:19:23 -07:00
Anatoliy Belsky
eafc567213 Merge branch 'PHP-5.4' 
* PHP-5.4:
  updated NEWS
 2012-05-08 18:53:36 +02:00
Anatoliy Belsky
0b4d7a455d Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  updated NEWS
 2012-05-08 18:52:48 +02:00
Anatoliy Belsky
838b4b8ff7 updated NEWS 2012-05-08 18:51:49 +02:00
Anatoliy Belsky
c5da8e699f Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61713 check also that mbstring's found any internal_encoding
 2012-05-08 18:35:15 +02:00
Anatoliy Belsky
4b307984df Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61713 check also that mbstring's found any internal_encoding
 2012-05-08 18:34:32 +02:00
Anatoliy Belsky
d776a933eb Fix bug 61713 check also that mbstring's found any internal_encoding 2012-05-08 18:31:11 +02:00
Anatoliy Belsky
8c69c6c6b0 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61713 ext\standard\tests\strings\htmlentities10.phpt fails
 2012-05-08 18:15:19 +02:00
Anatoliy Belsky
8987ad5cb2 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61713 ext\standard\tests\strings\htmlentities10.phpt fails
 2012-05-08 18:14:38 +02:00
Anatoliy Belsky
3a4a25358f Fix bug #61713 ext\standard\tests\strings\htmlentities10.phpt fails 
There is a logic error in charset detection part for htmlentities.
When mbstring is compiled shared and mbstring.internal_encoding
is set to pass, it prevents default_charset from being checked
resulting iso-8859-1 being choosed.
 2012-05-08 17:42:01 +02:00
Johannes Schlüter
544c6f2f22 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix #61704 (Crash apache, phpinfo() threading issue)
  Fix folding marks
 2012-05-08 17:30:46 +02:00
Johannes Schlüter
e8e661128a Fix #61704 (Crash apache, phpinfo() threading issue) 2012-05-08 17:30:05 +02:00
Johannes Schlüter
fb3b6bcf83 Fix folding marks 2012-05-08 15:18:33 +02:00
Johannes Schlüter
6e96d7cd5e Merge branch 'PHP-5.4' 
* PHP-5.4:
  This will be PHP 5.3.14
  improve fix for CVE-2012-1823
  improve fix for CVE-2012-1823
 2012-05-08 11:50:19 +02:00
Johannes Schlüter
340091469a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  This will be PHP 5.3.14
  improve fix for CVE-2012-1823
 2012-05-08 11:49:50 +02:00
Johannes Schlüter
e120a0c7f3 This will be PHP 5.3.14 2012-05-08 11:28:15 +02:00
Stanislav Malyshev
b50101764b improve fix for CVE-2012-1823 2012-05-07 12:14:57 -07:00
Stanislav Malyshev
000e84aa88 improve fix for CVE-2012-1823 2012-05-07 12:14:21 -07:00
Stanislav Malyshev
857fc1b473 Merge branch 'PHP-5.4' 
* PHP-5.4:
  improve fix for CVE-2012-1823
  Fix for CVE-2012-1823
 2012-05-07 12:12:48 -07:00
Stanislav Malyshev
36587ff335 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  improve fix for CVE-2012-1823
  Fix for CVE-2012-1823
 2012-05-07 12:10:36 -07:00
Stanislav Malyshev
7de4b75f74 improve fix for CVE-2012-1823 2012-05-07 12:08:36 -07:00
Rasmus Lerdorf
004941af15 Fix for CVE-2012-1823 2012-05-07 12:06:45 -07:00
Anatoliy Belsky
2c505ecc57 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt fails
  Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails
 2012-05-07 15:40:48 +02:00
Anatoliy Belsky
09664063a8 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt fails
  Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails
 2012-05-07 15:40:16 +02:00
Anatoliy Belsky
2068419ae5 Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt fails 2012-05-07 15:39:07 +02:00
Anatoliy Belsky
ce59121c5f Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails 2012-05-07 15:37:29 +02:00
andrey
c75cbd62dd these methods should return a stream. This makes it easier to intercept 
the return value
 2012-05-07 15:32:00 +02:00
andrey
68536a4167 comment for the #else 2012-05-07 13:55:40 +02:00
andrey
9927cc5f4b Merge branch 'master' of git.php.net:php-src 2012-05-07 13:32:05 +02:00
andrey
ec159081a0 reorganize things a bit...just shifting code 2012-05-07 13:31:42 +02:00
Anatoliy Belsky
692cc976ca Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61769 Random failure of php_cli_server*phpt tests
 2012-05-06 18:06:12 +02:00
Matt Ficken
87a011d372 Fix bug 61769 Random failure of php_cli_server*phpt tests 2012-05-06 18:05:02 +02:00
Xinchen Hui
067fad1b52 Merge branch 'PHP-5.4' 
* PHP-5.4:
  correct variable name
 2012-05-06 20:37:33 +08:00
Xinchen Hui
ad3a42c26c correct variable name 2012-05-06 20:37:03 +08:00
Xinchen Hui
5ad35d6c77 Merge branch 'PHP-5.4' 2012-05-06 20:32:33 +08:00
Xinchen Hui
376635cde8 Merge branch 'PHP-5.3' into PHP-5.4 2012-05-06 20:32:15 +08:00