mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
81,648 Commits 500 Branches 1,381 Tags 797 MiB
ca766e0787
Commit Graph

81648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Lowrey
ca766e0787 Fix broken test 2015-03-04 22:37:07 -07:00
Daniel Lowrey
241f3c34b8 Fixed bug #68920 (use strict peer_fingerprint input checks) 2015-03-04 12:47:46 -07:00
Xinchen Hui
a29b64fc10 Fixed bug #69159 (Opcache causes problem when passing a variable variable to a function) 2015-03-04 14:48:41 +08:00
Xinchen Hui
6183408031 Merge branch 'PHP-5.5' into PHP-5.6 2015-03-03 23:17:37 +08:00
nathan r. hruby
837eeefee9 Make killing a locker an ERROR event 
At least in apache, killing a locker with SIGKILL from inside opcache prevents
the child process from emitting a corresponding log event to the access or
error logs, therefore requests are termed with no record.  This makes is
incredibly difficult to debug problems espically on systems with high counts
of cache restarts.  Since INFO level is far too noisy for production use,
switch the killing to a higher level so we can see it easier.
 2015-03-03 23:16:45 +08:00
Reeze Xia
808e562f23 Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6 
* 'PHP-5.6' of git.php.net:/php-src:
 2015-03-03 16:28:01 +08:00
Reeze Xia
6cb3b941df Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Improve fix for bug 67741
  Added type checks
  Added type checks
 2015-03-03 16:27:35 +08:00
Reeze Xia
304fb7a3d6 Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:/php-src:
  Added type checks
  Added type checks
 2015-03-03 16:27:04 +08:00
Reeze Xia
860fc3947f Improve fix for bug 67741 
Thanks to laruence.
 2015-03-03 16:25:43 +08:00
Dmitry Stogov
c433f19a6b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Added type checks
 2015-03-03 10:46:55 +03:00
Dmitry Stogov
b3ac352253 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Added type checks
 2015-03-03 10:45:07 +03:00
Dmitry Stogov
c8eaca013a Added type checks 2015-03-03 10:43:48 +03:00
Dmitry Stogov
5c03e05692 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  Update NEWS
 2015-03-03 10:20:21 +03:00
Dmitry Stogov
66c883c0fd Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 
* 'PHP-5.6' of git.php.net:php-src:
  Update NEWS
 2015-03-03 10:19:54 +03:00
Dmitry Stogov
26827a0111 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Added type checks
  Fixed bug #67741 (auto_prepend_file messes up __LINE__)
  Check variable type before its usage as IS_ARRAY.
  Fixed a bug that header value is not terminated by '\0' when accessed through getenv().
 2015-03-03 09:59:32 +03:00
Dmitry Stogov
035d80523f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Added type checks

Conflicts:
	ext/soap/soap.c
 2015-03-03 09:52:21 +03:00
Dmitry Stogov
0c136a2abd Added type checks 2015-03-03 09:44:46 +03:00
Reeze Xia
f353162ca2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update NEWS
  Fixed bug #67741 (auto_prepend_file messes up __LINE__)
  Check variable type before its usage as IS_ARRAY.
  Fixed a bug that header value is not terminated by '\0' when accessed through getenv().

Conflicts:
	NEWS
 2015-03-03 14:37:06 +08:00
Reeze Xia
bb466d57ae Update NEWS 2015-03-03 14:22:03 +08:00
Reeze Xia
4e2c87edb3 Fixed bug #67741 (auto_prepend_file messes up __LINE__) 
This also fixes bug #54081
 2015-03-03 11:43:23 +08:00
Reeze Xia
34f09b6240 Fixed bug #67741 (auto_prepend_file messes up __LINE__) 
This also fixes bug #54081
 2015-03-03 11:25:30 +08:00
Dmitry Stogov
fc1f24b7a6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Check variable type before its usage as IS_ARRAY.
  Fixed a bug that header value is not terminated by '\0' when accessed through getenv().
 2015-03-02 12:30:38 +03:00
Dmitry Stogov
d5248f67b5 Check variable type before its usage as IS_ARRAY. 2015-03-02 12:27:36 +03: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
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
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
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
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
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
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
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
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
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
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