Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix flaws in session module

Conflicts:
	ext/session/session.c

diff --cc ext/session/php_session.h
Simple merge

diff --cc ext/session/session.c
index 25139d5ddb1a3e0c82ee0d21526ed87943663708,b73d5ede8dc9bec41cb9d8a575094b9f97d7d45a..0ddf6003bb9bccdd2d73f64d3fcea92ef77d563b
--- 1/ext/session/session.c
--- 2/ext/session/session.c
+++ b/ext/session/session.c
@@@ -125,11 -114,9 +125,13 @@@ static inline void php_rshutdown_sessio
                } zend_end_try();
        }
        if (PS(id)) {
 -              efree(PS(id));
 +              zend_string_release(PS(id));
+               PS(id) = NULL;
        }
 +      if (PS(session_vars)) {
 +              zend_string_release(PS(session_vars));
++              PS(session_vars) = NULL;
 +      }
  }
  /* }}} */