granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

author	Dmitry Stogov <dmitry@zend.com>
	Tue, 8 Jul 2014 07:32:29 +0000 (11:32 +0400)
committer	Dmitry Stogov <dmitry@zend.com>
	Tue, 8 Jul 2014 07:32:29 +0000 (11:32 +0400)
commit	8ce2f2caacc99c8a579ebfaa078ac9a063e2936f
tree	eeac185eb793b7a4e81d32ae4bbf84fb66b05246	tree \| snapshot
parent	b36aaea6ede499589b3298e204095c292d025c34	commit \| diff
parent	6e9bc95f6726f4d397d6f78e778f512b92b1b54b	commit \| diff

Merge branch 'master' into phpng

* master:
  Fix still broken session test.  Only return true/false.
  Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
  Followup fix to custom session save handlers
  create locales and re-add test
  rm test for now

Conflicts:
ext/session/tests/session_set_save_handler_class_012.phpt

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

.travis.yml	diff1 \|	diff2 \|	blob \| history
ext/session/mod_user.c	diff1 \|	diff2 \|	blob \| history
ext/session/session.c	diff1 \|	diff2 \|	blob \| history
ext/session/tests/session_set_save_handler_class_012.phpt	diff1 \|	diff2 \|	blob \| history
sapi/cli/php_cli_server.c	diff1 \|	diff2 \|	blob \| history