Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix bug #67972 (SessionHandler Invalid memory read create_sid()).
  Update LSAPI to 6.7, added support for 'filter_input'. Fixed a crash in CLI mode.
  5.5.18 now

diff --cc ext/session/mod_user_class.c
index 33fc71c5697c5bcaa0559eee8b0ef0e78444b2fc,2cbe482349ec2d589626637bc581fb3d48178c7c..35a681babdaa8b81444396975e746049bf703dd9
--- 1/ext/session/mod_user_class.c
--- 2/ext/session/mod_user_class.c
+++ b/ext/session/mod_user_class.c
@@@ -142,8 -146,10 +142,10 @@@ PHP_METHOD(SessionHandler, gc
     Wraps the old create_sid handler */
  PHP_METHOD(SessionHandler, create_sid)
  {
 -      char *id;
 +      zend_string *id;
  
+       PS_SANITY_CHECK;
+ 
        if (zend_parse_parameters_none() == FAILURE) {
            return;
        }