php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-25 16:52:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
70,444 Commits 547 Branches 1,481 Tags
134089372b94de2e3e8c2a1aba4cbc415c803d67
Commit Graph

29709 Commits

Author SHA1 Message Date
Nikita Popov
9b101ac8b3 Add T_YIELD "yield" keyword 2012-05-15 18:30:48 +02:00
Anatoliy Belsky
d0d7340d50 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61992 ext\standard\tests\general_functions\bug44295.phpt fails
 2012-05-10 17:35:09 +02:00
Anatoliy Belsky
b43d6c8522 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61992 ext\standard\tests\general_functions\bug44295.phpt fails
 2012-05-10 17:32:21 +02:00
Anatoliy Belsky
266578f584 Fix bug #61992 ext\standard\tests\general_functions\bug44295.phpt fails 
Exception text differ on windows
 2012-05-10 17:07:38 +02:00
Anatoliy Belsky
f6558a295d Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug ext\standard\tests\file\realpath_cache_win32.phpt fails
 2012-05-10 15:40:17 +02:00
Anatoliy Belsky
10d5f2301a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug ext\standard\tests\file\realpath_cache_win32.phpt fails
 2012-05-10 15:36:47 +02:00
Anatoliy Belsky
f7d8b274c7 Fix bug ext\standard\tests\file\realpath_cache_win32.phpt fails 
What happens here is trivial long overflow. Despite the bug attracted
attention on windows, the same story is on linux. Just wait for a big
anough bucket->key . The linux test had %i to check the key value
which should be %d all the way.
 2012-05-10 15:27:44 +02:00
Anatoliy Belsky
e3f2c76989 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails
 2012-05-09 13:06:47 +02:00
Anatoliy Belsky
f76d7be876 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails
 2012-05-09 13:04:32 +02:00
Anatoliy Belsky
7fb16d5bd9 Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails 
Another error message is produced by win specific code
 2012-05-09 13:02:33 +02: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
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
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
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
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
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
Xinchen Hui
99076bc24f Change the test folder 2012-05-06 20:31:40 +08:00
Xinchen Hui
556666cc4b Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61730 (Segfault from array_walk modifying an array passed by reference)
 2012-05-06 20:29:26 +08:00
Xinchen Hui
4cceeb25b7 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #61730 (Segfault from array_walk modifying an array passed by reference)
 2012-05-06 20:28:18 +08:00
Xinchen Hui
7ccd594392 Fixed bug #61730 (Segfault from array_walk modifying an array passed by reference) 2012-05-06 20:01:10 +08:00
Nikita Popov
9e1b690e0c Merge branch 'PHP-5.4' 
* PHP-5.4:
  Add NEWS entry for bug #61961
  Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
 2012-05-06 13:40:06 +02:00
Nikita Popov
bef6111609 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Add NEWS entry for bug #61961
  Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
 2012-05-06 13:33:47 +02:00
Nikita Popov
311ee8f69c Merge branch 'pull-request/76' into PHP-5.3 2012-05-06 12:45:45 +02:00
Reeze Xia
3e9923dd8d Fixed Bug #61961 (file_get_content leaks when access empty file with max length) 2012-05-06 18:27:26 +08:00
Xinchen Hui
71e7c854b1 Merge branch 'PHP-5.4' 
* PHP-5.4:
  correct NEWS
  Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
  Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
 2012-05-06 00:53:47 +08:00
Xinchen Hui
0747b29bdf Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  correct NEWS
  Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)

Conflicts:
	ext/curl/interface.c
 2012-05-06 00:52:51 +08:00
Xinchen Hui
19632ae7dc Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction) 2012-05-06 00:50:37 +08:00
Xinchen Hui
035ce937e1 Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction) 2012-05-06 00:40:49 +08:00
Anatoliy Belsky
56ac0e71bb Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails
 2012-05-04 11:42:28 +02:00
Anatoliy Belsky
f5936cceeb Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails
 2012-05-04 11:42:05 +02:00
Anatoliy Belsky
8a10259642 Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails 2012-05-04 11:40:49 +02:00
Anatoliy Belsky
7388c085bf Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt
  Bump to next version

Conflicts:
	configure.in
	main/php_version.h
 2012-05-04 11:38:43 +02:00
Anatoliy Belsky
16fdf86ea3 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt
 2012-05-04 11:32:12 +02:00
Anatoliy Belsky
6c12252790 Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt 2012-05-04 11:29:49 +02:00
andrey
267f691a45 bump mysqlnd versions 2012-05-03 15:33:47 +02:00
andrey
b850fa14e0 phoenix from the ashes 2012-05-03 13:34:26 +02:00