summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'www-apache/mod_scgi/files/mod_scgi-1.14-apache-2.4.patch')
-rw-r--r--www-apache/mod_scgi/files/mod_scgi-1.14-apache-2.4.patch49
1 files changed, 0 insertions, 49 deletions
diff --git a/www-apache/mod_scgi/files/mod_scgi-1.14-apache-2.4.patch b/www-apache/mod_scgi/files/mod_scgi-1.14-apache-2.4.patch
deleted file mode 100644
index 8c1240b18c31..000000000000
--- a/www-apache/mod_scgi/files/mod_scgi-1.14-apache-2.4.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/apache2/mod_scgi.c
-+++ b/apache2/mod_scgi.c
-@@ -135,16 +135,16 @@
- return DECLINED;
- }
-
--static void log_err(const char *file, int line, request_rec *r,
-+static void log_err(const char *file, int line, int index, request_rec *r,
- apr_status_t status, const char *msg)
- {
-- ap_log_rerror(file, line, APLOG_ERR, status, r, "scgi: %s", msg);
-+ ap_log_rerror(file, line, index, APLOG_ERR, status, r, "scgi: %s", msg);
- }
-
--static void log_debug(const char *file, int line, request_rec *r, const
-+static void log_debug(const char *file, int line, int index, request_rec *r, const
- char *msg)
- {
-- ap_log_rerror(file, line, APLOG_DEBUG, APR_SUCCESS, r, msg);
-+ ap_log_rerror(file, line, index, APLOG_DEBUG, APR_SUCCESS, r, "%s", msg);
- }
-
- static char *http2env(apr_pool_t *p, const char *name)
-@@ -312,7 +312,7 @@
- int i;
- apr_status_t rv = 0;
- apr_port_t port = 0;
-- GET_PORT(port, r->connection->remote_addr);
-+ GET_PORT(port, r->useragent_addr);
-
- log_debug(APLOG_MARK,r, "sending headers");
- t = apr_table_make(r->pool, 40);
-@@ -324,14 +324,14 @@
- buf = "0";
- add_header(t, "CONTENT_LENGTH", buf);
- add_header(t, "SCGI", SCGI_PROTOCOL_VERSION);
-- add_header(t, "SERVER_SOFTWARE", ap_get_server_version());
-+ add_header(t, "SERVER_SOFTWARE", ap_get_server_banner());
- add_header(t, "SERVER_PROTOCOL", r->protocol);
- add_header(t, "SERVER_NAME", ap_get_server_name(r));
- add_header(t, "SERVER_ADMIN", r->server->server_admin);
- add_header(t, "SERVER_ADDR", r->connection->local_ip);
- add_header(t, "SERVER_PORT", apr_psprintf(r->pool, "%u",
- ap_get_server_port(r)));
-- add_header(t, "REMOTE_ADDR", r->connection->remote_ip);
-+ add_header(t, "REMOTE_ADDR", r->useragent_ip);
- add_header(t, "REMOTE_PORT", apr_psprintf(r->pool, "%d", port));
- add_header(t, "REMOTE_USER", r->user);
- add_header(t, "REQUEST_METHOD", r->method);