]> granicus.if.org Git - apache/commit
Merge r1327036, r1327080 from trunk:
authorStefan Fritsch <sf@apache.org>
Tue, 3 Jul 2012 19:38:58 +0000 (19:38 +0000)
committerStefan Fritsch <sf@apache.org>
Tue, 3 Jul 2012 19:38:58 +0000 (19:38 +0000)
commit060cdc58cf40555bd3cbd4959496140e4e04cccb
tree49e91859e8872f22fa7a931336701258268b738a
parentae3c8e270b6c78f2482788ac7180c80c5b9cd26b
Merge r1327036, r1327080 from trunk:

    * server/mpm_unix.c (dummy_connection): Use a TLS 1.0 close_notify
      alert if the chosen listener is configured for https; not perfect
      but better than sending an HTTP request.  Adjust comments.

    * server/mpm_unix.c (dummy_connection): Fix spello.

Reviewed by: jorton, jim, covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1356884 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
STATUS
server/mpm_unix.c