D15706.id.diff
No OneTemporary
Actions

Size

987 B

Referenced Files

None

Subscribers

None

D15706.id.diff
View Options

	diff --git a/src/applications/diffusion/controller/DiffusionServeController.php b/src/applications/diffusion/controller/DiffusionServeController.php
	--- a/src/applications/diffusion/controller/DiffusionServeController.php
	+++ b/src/applications/diffusion/controller/DiffusionServeController.php
	@@ -164,7 +164,14 @@

	// If authentication credentials have been provided, try to find a user
	// that actually matches those credentials.
	- if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
	+
	+ // We require both the username and password to be nonempty, because Git
	+ // won't prompt users who provide a username but no password otherwise.
	+ // See T10797 for discussion.
	+
	+ $have_user = strlen(idx($_SERVER, 'PHP_AUTH_USER'));
	+ $have_pass = strlen(idx($_SERVER, 'PHP_AUTH_PW'));
	+ if ($have_user && $have_pass) {
	$username = $_SERVER['PHP_AUTH_USER'];
	$password = new PhutilOpaqueEnvelope($_SERVER['PHP_AUTH_PW']);