mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-29 03:39:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
70,391 Commits 503 Branches 1,387 Tags 784 MiB
252f623464
Commit Graph

70391 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Popov
252f623464 Add flag for generator functions 
Generator functions have to specify the * (asterix) modifier after the
function keyword. If they do so the ZEND_ACC_GENERATOR flag is added to
the fn_flags.
 2012-05-19 14:18:20 +02:00
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
27685b7bb5 Merge branch 'PHP-5.4' 
* PHP-5.4:
  updated NEWS
 2012-05-10 15:58:30 +02:00
Anatoliy Belsky
fc0c9054e6 updated NEWS 2012-05-10 15:56:50 +02:00
Anatoliy Belsky
4184551b94 Merge branch 'PHP-5.4' 
* PHP-5.4:
  updated NEWS
 2012-05-10 15:53:08 +02:00
Anatoliy Belsky
19f85f8676 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  updated NEWS
 2012-05-10 15:52:37 +02:00
Anatoliy Belsky
652632a89b updated NEWS 2012-05-10 15:48:56 +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
Xinchen Hui
134da93fbd Merge branch 'PHP-5.4' 
* PHP-5.4:
  Correct test title
 2012-05-09 11:29:19 +08:00
Xinchen Hui
d394c17293 Correct test title 2012-05-09 11:28:57 +08:00
Xinchen Hui
67075609d3 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Implemented FR #61977 (Need CLI web-server support for files with .htm & svg extensions)
 2012-05-09 11:28:09 +08:00
Xinchen Hui
1e60d0c105 Implemented FR #61977 (Need CLI web-server support for files with .htm & svg extensions) 2012-05-09 11:27:39 +08:00
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