mirror of
https://github.com/apache/httpd.git
synced 2025-08-07 04:02:58 +03:00
Replace ap_get_server_version with ap_get_server_banner() and
ap_get_server_description(). High-level summary: The full server version information is now included in the error log at startup as well as server status reports, irrespective of the setting of the ServerTokens directive. Third-party modules must now use ap_get_server_banner() or ap_get_server_description() in place of ap_get_server_version(). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@440337 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -224,7 +224,7 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker,
|
||||
"CONNECT %s HTTP/1.0" CRLF, r->uri);
|
||||
apr_socket_send(sock, buffer, &nbytes);
|
||||
nbytes = apr_snprintf(buffer, sizeof(buffer),
|
||||
"Proxy-agent: %s" CRLF CRLF, ap_get_server_version());
|
||||
"Proxy-agent: %s" CRLF CRLF, ap_get_server_banner());
|
||||
apr_socket_send(sock, buffer, &nbytes);
|
||||
}
|
||||
else {
|
||||
@@ -235,7 +235,7 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker,
|
||||
ap_xlate_proto_to_ascii(buffer, nbytes);
|
||||
apr_socket_send(client_socket, buffer, &nbytes);
|
||||
nbytes = apr_snprintf(buffer, sizeof(buffer),
|
||||
"Proxy-agent: %s" CRLF CRLF, ap_get_server_version());
|
||||
"Proxy-agent: %s" CRLF CRLF, ap_get_server_banner());
|
||||
ap_xlate_proto_to_ascii(buffer, nbytes);
|
||||
apr_socket_send(client_socket, buffer, &nbytes);
|
||||
#if 0
|
||||
@@ -244,7 +244,7 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker,
|
||||
*/
|
||||
r->status = HTTP_OK;
|
||||
r->header_only = 1;
|
||||
apr_table_set(r->headers_out, "Proxy-agent: %s", ap_get_server_version());
|
||||
apr_table_set(r->headers_out, "Proxy-agent: %s", ap_get_server_banner());
|
||||
ap_rflush(r);
|
||||
#endif
|
||||
}
|
||||
|
Reference in New Issue
Block a user