From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Jun 2014 19:23:52 +0000 (-0700)
Subject: Merge branch 'ye/doc-http-proto'
X-Git-Tag: v2.1.0-rc0~81
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ccca6b6523d7071cd0ee09fd00ea3e05d4b8e3eb?ds=inline;hp=-c

Merge branch 'ye/doc-http-proto'

* ye/doc-http-proto:
http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616
---

ccca6b6523d7071cd0ee09fd00ea3e05d4b8e3eb
diff --combined Documentation/technical/http-protocol.txt
index 59be59b0eb,58c7e872d7..229f845dfa
--- a/Documentation/technical/http-protocol.txt
+++ b/Documentation/technical/http-protocol.txt
@@@ -60,7 -60,7 +60,7 @@@ Because Git repositories are accessed b
  server administrators MAY use directory based permissions within
  their HTTP server to control repository access.
  
- Clients SHOULD support Basic authentication as described by RFC 2616.
+ Clients SHOULD support Basic authentication as described by RFC 2617.
  Servers SHOULD support Basic authentication by relying upon the
  HTTP server placed in front of the Git server software.
  
@@@ -374,7 -374,7 +374,7 @@@ C: Send one `$GIT_URL/git-upload-pack` 
     C: 0000
  
  The stream is organized into "commands", with each command
 -appearing by itself in a pkt-line.  Within a command line
 +appearing by itself in a pkt-line.  Within a command line,
  the text leading up to the first space is the command name,
  and the remainder of the line to the first LF is the value.
  Command lines are terminated with an LF as the last byte of