mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-17 13:59:28 +08:00
Code Issues Packages Projects Releases Wiki Activity
88,359 Commits 503 Branches 1,384 Tags 832 MiB
9dac9237ab
Commit Graph

88359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
9dac9237ab Merge branch 'PHP-5.6' 
Conflicts:
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
 2015-03-01 23:20:22 +08:00
Xinchen Hui
169ac35c66 Update NEWS 2015-03-01 23:17:57 +08:00
Xinchen Hui
672a396d4a Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/standard/var_unserializer.c
 2015-03-01 23:17:41 +08:00
Xinchen Hui
caebb76131 Fixed bug #69139 (Crash in gc_zval_possible_root on unserialize) 2015-03-01 23:16:15 +08:00
Ferenc Kovacs
ddd9411f04 windows only test 2015-03-01 13:02:44 +01:00
Lior Kaplan
3b25766b18 Align entries format 2015-03-01 11:44:30 +02:00
Lior Kaplan
1c6599d804 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Align entries format for 5.6.7
  Align entries format for 5.5.23
 2015-03-01 11:37:02 +02:00
Lior Kaplan
aaaa905912 Align entries format for 5.6.7 2015-03-01 11:36:01 +02:00
Lior Kaplan
041b472d6f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Align entries format for 5.5.23
 2015-03-01 11:34:11 +02:00
Lior Kaplan
55f7747bff Align entries format for 5.5.23 2015-03-01 11:32:09 +02:00
Reeze Xia
7109a39ddb Merge branch 'PHP-5.6' 
* PHP-5.6:
  Bump header year
  Update NEWS

Conflicts:
	NEWS
 2015-03-01 15:15:03 +08:00
Reeze Xia
214350f4f4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bump header year
 2015-03-01 15:08:20 +08:00
Reeze Xia
c98eb695b5 Bump header year 2015-03-01 15:03:21 +08:00
Xinchen Hui
54e2020ee3 Fixed bug #69144 (strtr not replacing with partly matching replace pairs) 2015-02-28 22:37:46 +08:00
Xinchen Hui
49d19f6c7c Fixed test? 2015-02-28 22:35:55 +08:00
Reeze Xia
1359dfd18f Revert mktime()/gmmktime()'s arginfo 
$is_dst parameter has been removed in commit: 9c5eaac18b
 2015-02-28 18:32:18 +08:00
Reeze Xia
6ef477f947 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update NEWS
 2015-02-28 16:45:44 +08:00
Reeze Xia
8b0cf0d7fa Update NEWS 2015-02-28 16:45:26 +08:00
Reeze Xia
968a9f4807 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #69141 Missing arguments in reflection info for some builtin functions
 2015-02-28 16:43:41 +08:00
Reeze Xia
1b240ff9e3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #69141 Missing arguments in reflection info for some builtin functions
 2015-02-28 16:40:06 +08:00
Reeze Xia
f824f91ac9 Fixed bug #69141 Missing arguments in reflection info for some builtin functions 
This include:

- setcookie (missing "httponly")
- setrawcookie (missing "httponly")
- spl_autoload_register (missing 2 optional params)
- mktime  (missing "is_dst")
- gmmktime (missing "is_dst")
 2015-02-28 16:37:14 +08:00
Bob Weinand
ed10253311 Add NEWS entry 2015-02-27 23:28:19 +01:00
Bob Weinand
b22caa81ee Remove useless date warning 2015-02-27 23:27:09 +01:00
Nikita Popov
ffe47393ab Merge branch 'PHP-5.6' 2015-02-27 23:24:02 +01:00
Nikita Popov
b41b229d78 Merge branch 'PHP-5.5' into PHP-5.6 2015-02-27 23:23:49 +01:00
Дмитрий Пацура
e9c6798721 Fix ARG_INFO for levenshtein 
This can work with 2 parameters (require)

refs http://php.net/manual/ru/function.levenshtein.php
refs https://github.com/phalcon/zephir/issues/753
 2015-02-27 23:23:24 +01:00
Дмитрий Пацура
5806e370d2 Fix ARG_INFO for levenshtein 
This can work with 2 parameters (require)

refs http://php.net/manual/ru/function.levenshtein.php
refs https://github.com/phalcon/zephir/issues/753
 2015-02-27 23:15:35 +01:00
Anatol Belski
5aec067b34 fix dir separator in tests 2015-02-27 16:48:09 +01:00
Xinchen Hui
1aea0f4b59 Merge branch 'master' of https://git.php.net/repository/php-src 2015-02-27 23:35:56 +08:00
Xinchen Hui
794a28832d Merge branch 'PHP-5.6' 
Conflicts:
	ext/soap/soap.c
 2015-02-27 23:35:37 +08:00
Xinchen Hui
4119879a39 Update NEWS 2015-02-27 23:33:23 +08:00
Xinchen Hui
86ba1a2444 Merge branch 'PHP-5.5' into PHP-5.6 2015-02-27 23:32:59 +08:00
Xinchen Hui
997b7e5630 Fixed bug #69085 (SoapClient's __call() type confusion through unserialize()). 2015-02-27 23:32:32 +08:00
Dmitry Stogov
1cdee9a5d8 Fixed C++ support 2015-02-27 13:45:11 +03:00
Anatol Belski
30830bcefd Fixed bug #69115 crash in mail 
There were two issues

- php_pcre_replace could be used directly and sbject_str could be NULL
- the Windows sendmail variant was freeing something passed from the outside
 2015-02-27 10:42:20 +01:00
Xinchen Hui
8f5676f73e Merge branch 'PHP-5.6' 2015-02-27 12:03:04 +08:00
Xinchen Hui
578903578c Merge branch 'PHP-5.5' into PHP-5.6 2015-02-27 12:03:00 +08:00
Xinchen Hui
4eb830b212 Reorder 2015-02-27 12:02:42 +08:00
Xinchen Hui
b0e95e1e35 Merge branch 'PHP-5.6' 2015-02-27 12:01:40 +08:00
Xinchen Hui
414bc8ee03 Update NEWs 2015-02-27 12:01:28 +08:00
Xinchen Hui
d377cb6207 Merge branch 'PHP-5.5' into PHP-5.6 2015-02-27 12:01:05 +08:00
Xinchen Hui
ebfc49aa91 Fixed bug #69121 (Segfault in get_current_user when script owner is not in passwd with ZTS build) 2015-02-27 12:00:52 +08:00
Xinchen Hui
a8927cd647 Merge branch 'PHP-5.6' 2015-02-27 11:43:49 +08:00
Xinchen Hui
4b83d02b4b Update News 2015-02-27 11:43:41 +08:00
Xinchen Hui
cfaf7c3b5f Merge branch 'PHP-5.5' into PHP-5.6 2015-02-27 11:42:57 +08:00
Xinchen Hui
3e82816ba1 Fixed bug #69125 (Array numeric string as key) 2015-02-27 11:42:36 +08:00
Xinchen Hui
5b8a504519 Merge branch 'PHP-5.6' 
Conflicts:
	ext/date/php_date.c
 2015-02-27 11:13:07 +08:00
Xinchen Hui
2d1a3ecd27 Merge branch 'PHP-5.5' into PHP-5.6 2015-02-27 11:11:45 +08:00
Taoguang Chen
e441d71baa fix bug#68942's patch 
Fix type confusion bug in unserialize() with DateTimeZone. https://bugs.php.net/bug.php?id=68942
 2015-02-27 10:41:53 +08:00
Dmitry Stogov
2bb9a59175 Fixed ability to build unspecialized executor 2015-02-26 17:53:03 +03:00