]> granicus.if.org Git - php/commit
Merge branch 'pr368' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 5 Aug 2013 03:00:28 +0000 (20:00 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 5 Aug 2013 03:00:28 +0000 (20:00 -0700)
commit6f73a0c00f0577313897e455f6fd729cfaa97f3b
treed87d7ac5d44fe0efee9dc428a21d32b593f67a62
parent7d3fa7d8b6df6e1fcef1ea06db8e0ee8215c11ed
parentb80d73ce154e7f740f9ada446f45dbcdac38a64b
Merge branch 'pr368' into PHP-5.5

* pr368:
  fix crash, enable session_id and fix test
  Strict session. Detect session id collision
  Strict session