clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 06:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,604 Commits 494 Branches 1,367 Tags 800 MiB
b07d5913dd
Commit Graph

33521 Commits

Author SHA1 Message Date
Xinchen Hui
0e4cfad1e8 Refactor php_addcslashes using zend_string 2014-02-22 20:51:26 +08:00
Xinchen Hui
b1fb93b482 Fixed segfault in ext/standard/tests/strings/bug24208.php 
it still ugly,, maybe we should make EG(active_symbol_table) a zend_array?
 2014-02-22 20:19:12 +08:00
Xinchen Hui
3cf418c50a No refcounted type 2014-02-22 20:05:04 +08:00
Dmitry Stogov
d149228b69 Use better data structures (incomplete) 2014-02-21 23:51:08 +04:00
Dmitry Stogov
6454684212 Use better data structures (incomplete) 2014-02-21 22:59:51 +04:00
Dmitry Stogov
52bd62eca8 Fixed assertions 2014-02-21 20:35:40 +04:00
Xinchen Hui
013cc55395 Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 
Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner.l
 2014-02-21 22:41:48 +08:00
Dmitry Stogov
d0eccdeea1 Fixed array_unshift() 2014-02-21 17:38:12 +04:00
Dmitry Stogov
7e03f3712b All zend_parse_parameters("Z") has to be replaced with zend_parse_parameters("z") 2014-02-21 17:22:02 +04:00
Xinchen Hui
8211026fa7 Fixed segfault in ext/standard/tests/strings/add-and-stripslashes.phpt 2014-02-21 16:39:59 +08:00
Xinchen Hui
189a39a187 Fixed segfault 2014-02-19 18:49:00 +08:00
Xinchen Hui
c1c4d26817 Use better data structures (incomplete) 2014-02-19 17:58:39 +08:00
Dmitry Stogov
557994d50d Use better data structures (incomplete) 2014-02-19 01:12:05 +04:00
Dmitry Stogov
246d50fd95 Fixed memory leak 2014-02-18 17:11:57 +04:00
Dmitry Stogov
7428cac6e8 Use better data structures (incomplete) 2014-02-18 16:44:01 +04:00
Dmitry Stogov
9ddf3c5780 Merge branch 'refactoring2' of github.com:zend-dev/php into refactoring2 2014-02-18 16:28:26 +04:00
Dmitry Stogov
5de7115679 Use better data structures (incomplete; able to run bench.php) 2014-02-18 16:27:38 +04:00
Xinchen Hui
43b03c74b3 Refacting smart_str 2014-02-18 17:42:46 +08:00
Dmitry Stogov
2b9b9afa7a Use better data structures (incomplete) 2014-02-17 17:59:18 +04:00
Xinchen Hui
ad1838d248 Use better data structures (incomplete) 2014-02-16 22:27:31 +08:00
Xinchen Hui
f0168baecf Use better data structures (incomplete) 2014-02-16 22:15:54 +08:00
Xinchen Hui
34aefa5604 Use better data structures (incomplete) 2014-02-15 23:21:09 +08:00
Xinchen Hui
6cb316cf5d Use better data structures (incomplete) 2014-02-14 23:11:40 +08:00
Dmitry Stogov
c56a2344d0 Merge branch 'refactoring2' of github.com:zend-dev/php into refactoring2 2014-02-14 13:40:23 +04:00
Dmitry Stogov
398256e5fe Use better data structures (incomplete) 2014-02-14 13:40:11 +04:00
Xinchen Hui
068ec75f8b Use better data structures (incomplete) 2014-02-14 17:05:04 +08:00
Dmitry Stogov
40e053e7f3 Use better data structures (incomplete) 2014-02-13 17:54:23 +04:00
Dmitry Stogov
6306918ed2 Use better data structures (incomplete) 2014-02-12 23:54:04 +04:00
Dmitry Stogov
7a9348f45d Reverted zval_clear() and zval_release() back to zval_ptr_dtor() 2014-02-12 22:51:19 +04:00
Xinchen Hui
d3954f16d3 Use better data structures (incomplete) -- stash for today work 2014-02-12 22:15:08 +08:00
Dmitry Stogov
4e66abad54 Use better data structures (incomplete) - refactored return_value handling 2014-02-12 14:29:51 +04:00
Xinchen Hui
0c0efba45f Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 2014-02-11 19:33:48 +08:00
Xinchen Hui
3f4c877bf7 Use better data structures (incomplete) 2014-02-11 19:33:18 +08:00
Dmitry Stogov
2161103fc3 Use better data structures (incomplete) 2014-02-10 17:49:21 +04:00
Dmitry Stogov
00244baba8 Use better data structures (incomplete) 2014-02-10 12:18:01 +04:00
Dmitry Stogov
f4cfaf36e2 Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
Remi Collet
5b5b9b9239 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Skip readline tests which fail with libedit Add specific libedit test (output slightly differs)
 2014-01-20 09:39:39 +01:00
Remi Collet
0401226d93 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Skip readline tests which fail with libedit Add specific libedit test (output slightly differs)
 2014-01-20 09:39:29 +01:00
Remi Collet
e3192473b5 Skip readline tests which fail with libedit 
Add specific libedit test (output slightly differs)
 2014-01-20 09:38:34 +01:00
Remi Collet
3b82a477b0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed Bug #66412 readline_clear_history() with libedit causes segfault after #65714
 2014-01-20 08:41:04 +01:00
Remi Collet
91513097ca Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed Bug #66412 readline_clear_history() with libedit causes segfault after #65714
 2014-01-20 08:40:39 +01:00
Remi Collet
31d67bd353 Fixed Bug #66412 readline_clear_history() with libedit causes segfault after #65714 
Checking all libedit functions, this check is done in each functions (add_history,
read_history, write_history, ...) but is missing in clear_history.

Test coverage: readline_clear_history_001.phpt
 2014-01-20 08:38:53 +01:00
Yasuo Ohgaki
fd45f1eb78 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
 2014-01-19 13:33:27 +09:00
Yasuo Ohgaki
fb7e25d2e0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
 2014-01-19 13:32:35 +09:00
Yasuo Ohgaki
4e55c6bffb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
 2014-01-19 13:31:50 +09:00
Yasuo Ohgaki
e769c96a11 Enable zend.multibyte tests. Tipcal configuration works, but most tests fail. 2014-01-19 13:29:45 +09:00
Will Fitch
9eb4bc2f84 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix #62479: Some chars not parsed in passwords
 2014-01-18 19:49:06 -05:00
Will Fitch
fb2091b1d4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix #62479: Some chars not parsed in passwords
 2014-01-18 19:41:45 -05:00
Will Fitch
98907a96f9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix #62479: Some chars not parsed in passwords
 2014-01-18 19:40:54 -05:00
Will Fitch
da83b513b2 Fix #62479: Some chars not parsed in passwords 
This fixes an issue where backslashes and spaces aren't
correctly parsed for passwords.
 2014-01-18 19:27:40 -05:00
Will Fitch
4e5195f82c Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #66509: copy() arginfo incorrect since 5.4
 2014-01-18 11:57:34 -05:00
Will Fitch
a540c57331 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #66509: copy() arginfo incorrect since 5.4
 2014-01-18 11:56:22 -05:00
Will Fitch
767e6d2e08 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #66509: copy() arginfo incorrect since 5.4

Conflicts:
	NEWS
 2014-01-18 11:39:32 -05:00
Will Fitch
5b906ce6eb Fix bug #66509: copy() arginfo incorrect since 5.4 
Since 5.4, the ZEND_BEGIN_ARG_INFO_EX was replaced
by non _EX, causing Reflection to assume the
$context parameter is required.
 2014-01-18 11:25:53 -05:00
Anatol Belski
deb56c010e Merge branch 'PHP-5.6' 2014-01-17 11:08:21 +01:00
Anatol Belski
b58dbefba0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  added appropriate exception handling flag to ext\intl
  Update NEWS
 2014-01-17 11:08:02 +01:00
Anatol Belski
7f0aff52cf added appropriate exception handling flag to ext\intl 
According to the doc page
http://msdn.microsoft.com/en-us/library/1deeycx5.aspx
it's appropriate as none of the extern C functions do throw
exceptions. This also fixes the warning C4530.
 2014-01-17 11:03:40 +01:00
Anatol Belski
feb4eb850d Merge branch 'PHP-5.6' 
* PHP-5.6:
  forked the test for bug #66481
 2014-01-17 03:32:26 +01:00
Anatol Belski
8b703e9ee0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  forked the test for bug #66481
 2014-01-17 03:32:06 +01:00
Anatol Belski
14e371e7d4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  forked the test for bug #66481
 2014-01-17 03:31:38 +01:00
Anatol Belski
a218a8b917 forked the test for bug #66481 2014-01-17 03:30:42 +01:00
Xinchen Hui
7691926bbe Merge branch 'PHP-5.6' 2014-01-16 14:42:14 +08:00
Xinchen Hui
bfcdd67865 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-16 14:42:04 +08:00
Xinchen Hui
9799816e0c Merge branch 'PHP-5.4' into PHP-5.5 2014-01-16 14:41:52 +08:00
Xinchen Hui
b777248ded Re-fixed Bug #66481 (Calls to session_name() segfault when session.name is null) 2014-01-16 14:41:12 +08:00
Xinchen Hui
271053ad47 Revert "Bug #66481 Segfaults on session_name()" 
This reverts commit 5662ffb295.
 2014-01-16 14:38:35 +08:00
Yasuo Ohgaki
7b5b2b4efa Merge branch 'PHP-5.6' 
* PHP-5.6:
  Bug #66481 Segfaults on session_name()
 2014-01-16 11:35:57 +09:00
Yasuo Ohgaki
518327f7e3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #66481 Segfaults on session_name()
 2014-01-16 11:35:11 +09:00
Yasuo Ohgaki
744f38c2d6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #66481 Segfaults on session_name()
 2014-01-16 11:34:31 +09:00
Conor McDermottroe
5662ffb295 Bug #66481 Segfaults on session_name() 
If the previous value of session.name was NULL then any call to
session_name($string) would result in a segmentation fault.

This changes the behaviour to set the value of session.name to
"PHPSESSID" if a blank value is given in php.ini or via -d on the
command line. There is already protection against setting it to NULL via
session_name() or ini_set().
 2014-01-16 11:33:10 +09:00
Dmitry Stogov
511a375e60 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Log information about cached scripts and keys
 2014-01-15 12:15:41 +04:00
Dmitry Stogov
299d893f0a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Log information about cached scripts and keys
 2014-01-15 12:15:25 +04:00
Dmitry Stogov
7359dd6df3 Log information about cached scripts and keys 2014-01-15 12:12:22 +04:00
Dmitry Stogov
61028ad45e Merge branch 'PHP-5.6' 
* PHP-5.6:
  We don't know PHP_5_6_X_API_NO yet
 2014-01-15 11:11:01 +04:00
Dmitry Stogov
77bc5b8bae We don't know PHP_5_6_X_API_NO yet 2014-01-15 11:09:38 +04:00
Yasuo Ohgaki
e4f1eee6c3 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Added pg_lo_truncate() and 64bit large object support from PostgreSQL 9.3 and up
 2014-01-15 14:39:56 +09:00
Yasuo Ohgaki
28be6aea9c Added pg_lo_truncate() and 64bit large object support from PostgreSQL 9.3 and up 2014-01-15 14:37:24 +09:00
Yasuo Ohgaki
a92c5b14cf Merge branch 'PHP-5.6' 
* PHP-5.6:
  Always initialize pg_version() result array elements to prevent failed test with older postgresql servers. Add missing client_encoding element.
 2014-01-15 14:28:08 +09:00
Yasuo Ohgaki
c58329fccc Always initialize pg_version() result array elements to prevent failed test with older postgresql servers. Add missing client_encoding element. 2014-01-15 14:27:33 +09:00
Yasuo Ohgaki
ee4e5ce2cf Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed pg_version() crash with older postgresql
 2014-01-15 13:32:43 +09:00
Yasuo Ohgaki
d0924c2500 Fixed pg_version() crash with older postgresql 2014-01-15 13:32:15 +09:00
Yasuo Ohgaki
42c134df4b Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed session module is sending multiple set-cookie headers when session.use_strict_mode=1
 2014-01-15 11:07:51 +09:00
Yasuo Ohgaki
167eaedcbd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed session module is sending multiple set-cookie headers when session.use_strict_mode=1
 2014-01-15 11:07:10 +09:00
Yasuo Ohgaki
f52c251f60 Fixed session module is sending multiple set-cookie headers when session.use_strict_mode=1 2014-01-15 11:06:06 +09:00
Xinchen Hui
aca07343ce Merge branch 'PHP-5.6' 2014-01-14 22:34:53 +08:00
Nikita Popov
a5ee337156 Fixed arguments unpacking segfault with opcache 2014-01-14 22:34:08 +08:00
Anatol Belski
25e57e702b fix uninitialized value 2014-01-14 09:47:27 +01:00
Yasuo Ohgaki
681e1a5ce0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Made pg_version() return full connection info.
 2014-01-14 10:16:43 +09:00
Yasuo Ohgaki
58dff7cee5 Made pg_version() return full connection info. 2014-01-14 10:10:48 +09:00
Paul Tarjan
d599d36d49 Dont ignore errors from FT_Get_Glyph 2014-01-13 16:30:48 -08:00
Andrey Hristov
bbc37e78e8 Merge branch 'master' of git.php.net:php-src 2014-01-14 01:32:36 +02:00
Andrey Hristov
73008bb5ce More refactoring of the big function generating execute requests 2014-01-14 01:31:16 +02:00
Dmitry Stogov
5980e987d2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed ZTS build
 2014-01-13 23:11:36 +04:00
Dmitry Stogov
029d019dac Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed ZTS build
 2014-01-13 23:10:35 +04:00
Dmitry Stogov
9c32d30020 Fixed ZTS build 2014-01-13 23:09:59 +04:00
Anatol Belski
de137e5a8d Merge branch 'PHP-5.6' 
* PHP-5.6:
  forked test for win32
 2014-01-13 17:13:11 +01:00
Anatol Belski
9b2dc009b2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  forked test for win32
 2014-01-13 17:12:53 +01:00
Anatol Belski
8092de3ca3 forked test for win32 2014-01-13 17:12:14 +01:00
Dmitry Stogov
127eb33b84 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)
 2014-01-13 18:07:26 +04:00
Dmitry Stogov
7864fcaec9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)

Conflicts:
	NEWS
 2014-01-13 18:06:49 +04:00
Dmitry Stogov
ce2f024e9f Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0) 2014-01-13 18:05:21 +04:00
Dmitry Stogov
e141592da6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66440 (Optimisation of conditional JMPs based on pre-evaluate constant function calls)
 2014-01-13 16:16:57 +04:00
Dmitry Stogov
9b74dc4a07 Fixed bug #66440 (Optimisation of conditional JMPs based on pre-evaluate constant function calls) 2014-01-13 16:16:23 +04:00
Dmitry Stogov
f5182741a6 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  move common code into a function
 2014-01-13 15:36:37 +04:00
Dmitry Stogov
3458dac342 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66471 (Keep backward compatibility)
 2014-01-13 15:36:06 +04:00
Dmitry Stogov
ca550248f1 Fixed bug #66471 (Keep backward compatibility) 2014-01-13 15:34:25 +04:00
Andrey Hristov
cf9966671c Merge branch 'master' of git.php.net:php-src 2014-01-13 12:40:59 +02:00
Andrey Hristov
01d5e28057 move common code into a function 2014-01-13 12:40:39 +02:00
Dmitry Stogov
aab2e8eb7e Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)
 2014-01-13 12:08:23 +04:00
Dmitry Stogov
d09d64c15c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)

Conflicts:
	NEWS
 2014-01-13 12:07:50 +04:00
Dmitry Stogov
fcd75690fe Fixed bug #66474 (Optimizer bug in constant string to boolean conversion) 2014-01-13 12:06:19 +04:00
Johannes Schlüter
82dfe1acc8 Merge branch 'PHP-5.6' 2014-01-10 16:04:29 +01:00
Johannes Schlüter
45d46d7edd Merge branch 'PHP-5.5' into PHP-5.6 2014-01-10 16:02:46 +01:00
Johannes Schlüter
98e06a10d3 fix encoding 2014-01-10 15:57:40 +01:00
Anatol Belski
9aaea81cfe Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed EOL in the test
 2014-01-09 15:29:16 +01:00
Anatol Belski
ec89e6bfe2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed EOL in the test
 2014-01-09 15:28:47 +01:00
Anatol Belski
4f115c0b7d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed EOL in the test
 2014-01-09 15:28:09 +01:00
Anatol Belski
b8774519e2 fixed EOL in the test 2014-01-09 15:27:26 +01:00
Anatol Belski
3572a0482d Merge branch 'PHP-5.6' 
* PHP-5.6:
  added testcase from bug #65371
 2014-01-09 15:25:18 +01:00
Anatol Belski
4fe9a5d611 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  added testcase from bug #65371
 2014-01-09 15:24:55 +01:00
Anatol Belski
418602adfb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  added testcase from bug #65371
 2014-01-09 15:24:31 +01:00
Anatol Belski
e927dbd1f6 added testcase from bug #65371 2014-01-09 15:23:49 +01:00
Dmitry Stogov
83b00bbd08 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
 2014-01-09 13:50:12 +04:00
Dmitry Stogov
f16a4bc203 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
 2014-01-09 13:49:54 +04:00
Dmitry Stogov
b5fbde9c5b Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry) 2014-01-09 13:48:08 +04:00
Scott MacVicar
6fe34014f0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  [libxml] Unit test for libxml_disable_entity_loader()
 2014-01-06 17:06:33 +00:00
Scott MacVicar
28beaaad9c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  [libxml] Unit test for libxml_disable_entity_loader()
 2014-01-06 17:05:34 +00:00
Scott MacVicar
42f084c692 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  [libxml] Unit test for libxml_disable_entity_loader()
 2014-01-06 17:05:16 +00:00
Scott MacVicar
24cc7c0be2 [libxml] Unit test for libxml_disable_entity_loader() 
Summary:
Test to make sure libxml_disable_entity_loader() is behaving.
 2014-01-06 17:04:54 +00:00
Anatol Belski
e797e058c5 Merge branch 'PHP-5.6' 
* PHP-5.6:
  one more extension for the basename test
 2014-01-05 19:22:11 +01:00
Anatol Belski
61e1f79585 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  one more extension for the basename test
 2014-01-05 19:21:49 +01:00
Anatol Belski
748e707bf9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  one more extension for the basename test
 2014-01-05 19:21:27 +01:00
Anatol Belski
1c586d4070 one more extension for the basename test 2014-01-05 19:19:54 +01:00
Anatol Belski
ac875f8f7e Merge branch 'PHP-5.6' 
* PHP-5.6:
  improved the fix for bug #66395
  Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
  updated NEWS
  Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
 2014-01-05 19:13:40 +01:00
Anatol Belski
e5dd5d0ad4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  improved the fix for bug #66395
  updated NEWS
  Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
 2014-01-05 19:13:15 +01:00
Anatol Belski
3bde9cfd8d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  improved the fix for bug #66395
 2014-01-05 19:12:52 +01:00
Anatol Belski
3f7f72adb2 improved the fix for bug #66395 
- fixed the traverse vulnerability in case like c:d:file.txt
- ensure paths containing NTFS streams are still worky
 2014-01-05 19:05:04 +01:00
Anatol Belski
b502c0a3dc Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66395 basename function doesn't remove drive letter
 2014-01-03 22:39:17 +01:00
Anatol Belski
f0100261e1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66395 basename function doesn't remove drive letter
 2014-01-03 22:38:47 +01:00
Anatol Belski
d3a053d9f4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #66395 basename function doesn't remove drive letter
 2014-01-03 22:32:39 +01:00
Anatol Belski
46f60fae22 Fixed bug #66395 basename function doesn't remove drive letter 2014-01-03 22:25:58 +01:00
Xinchen Hui
b209c27302 Merge branch 'PHP-5.6' 2014-01-03 11:37:32 +08:00
Xinchen Hui
4e2ae5f5ca Here need to be str_efree 
found by ext/standard/tests/general_functions/phpinfo2.php fails
 2014-01-03 11:36:50 +08:00
Xinchen Hui
af6c11c5f0 Bump year 2014-01-03 11:11:57 +08:00
Xinchen Hui
0f53e37494 Merge branch 'PHP-5.6' 2014-01-03 11:09:07 +08:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Derick Rethans
63d390cdf9 Merge branch 'PHP-5.6' 2014-01-02 12:47:52 +00:00
Derick Rethans
110b7dcfb8 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-02 12:47:44 +00:00