]> granicus.if.org Git - apache/commit
Merge r1328325, r1328326:
authorStefan Fritsch <sf@apache.org>
Sat, 5 May 2012 08:44:19 +0000 (08:44 +0000)
committerStefan Fritsch <sf@apache.org>
Sat, 5 May 2012 08:44:19 +0000 (08:44 +0000)
commitc176f92e001fe480bf4db341e98f0b2c635684aa
tree8eb67392a680a1a95ef818a86ba0d72765367973
parentd66cc501dde7b549aaefa169e8cd36bfae4a713c
Merge r1328325, r1328326:

When receiving http on https, send the error response with http 1.0
It is important that we send a proper error status, or search engines
may index the error message.

Remove the link in the speaking-http-on-https error message.
With SNI, the link will usually be wrong. So better send no link at all.

PR: 50823
Reviewed by: sf, jorton, trawick

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1334346 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
STATUS
modules/ssl/ssl_engine_io.c
modules/ssl/ssl_engine_kernel.c
modules/ssl/ssl_private.h