Merge branch 'httponly-cookies' of https://github.com/mj/php-src

author Andrea Faulds <ajf@ajf.me>

Thu, 12 Jun 2014 09:03:14 +0000 (10:03 +0100)

committer Andrea Faulds <ajf@ajf.me>

Thu, 12 Jun 2014 09:03:14 +0000 (10:03 +0100)
author Andrea Faulds <ajf@ajf.me>
Thu, 12 Jun 2014 09:03:14 +0000 (10:03 +0100)
committer Andrea Faulds <ajf@ajf.me>
Thu, 12 Jun 2014 09:03:14 +0000 (10:03 +0100)
diff --cc ext/session/session.c
Simple merge
diff --cc ext/standard/tests/network/setcookie.phpt
Simple merge
author	Andrea Faulds <ajf@ajf.me>
	Thu, 12 Jun 2014 09:03:14 +0000 (10:03 +0100)
committer	Andrea Faulds <ajf@ajf.me>
	Thu, 12 Jun 2014 09:03:14 +0000 (10:03 +0100)
		1	2
ext/session/session.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/standard/tests/network/setcookie.phpt	patch \|	diff1 \|	diff2 \|	blob \| history