Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 575042 Details for
Bug 809705
[PATCH] Fix compilation with httpd-2.4
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
proposed patch
0001-Fixed-compilation-with-httpd-2.4.patch (text/plain), 4.15 KB, created by
Jan Kaluža
on 2012-04-04 06:40:33 UTC
(
hide
)
Description:
proposed patch
Filename:
MIME Type:
Creator:
Jan Kaluža
Created:
2012-04-04 06:40:33 UTC
Size:
4.15 KB
patch
obsolete
>From 75031e8b9d3916280dcd7c8b611d2024d1e91981 Mon Sep 17 00:00:00 2001 >From: Jan Kaluza <hanzz.k@gmail.com> >Date: Wed, 4 Apr 2012 08:31:05 +0200 >Subject: [PATCH] Fixed compilation with httpd-2.4 > >--- > mod_scgi-httpd24.patch | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ > mod_scgi.spec | 10 ++++++-- > 2 files changed, 60 insertions(+), 3 deletions(-) > create mode 100644 mod_scgi-httpd24.patch > >diff --git a/mod_scgi-httpd24.patch b/mod_scgi-httpd24.patch >new file mode 100644 >index 0000000..85a81a2 >--- /dev/null >+++ b/mod_scgi-httpd24.patch >@@ -0,0 +1,53 @@ >+diff --git a/apache2/mod_scgi.c b/apache2/mod_scgi.c >+index 4c6384c..8ccdc6b 100644 >+--- a/apache2/mod_scgi.c >++++ b/apache2/mod_scgi.c >+@@ -135,16 +135,17 @@ static int scgi_map_location(request_rec *r) >+ return DECLINED; >+ } >+ >+-static void log_err(const char *file, int line, request_rec *r, >++static void log_err(const char *file, int line, int module_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, module_index, APLOG_ERR, status, r, >++ "scgi: %s", msg); >+ } >+ >+-static void log_debug(const char *file, int line, request_rec *r, const >+- char *msg) >++static void log_debug(const char *file, int line, int module_index, >++ request_rec *r, const char *msg) >+ { >+- ap_log_rerror(file, line, APLOG_DEBUG, APR_SUCCESS, r, msg); >++ ap_log_rerror(file, line, module_index, APLOG_DEBUG, APR_SUCCESS, r, msg); >+ } >+ >+ static char *http2env(apr_pool_t *p, const char *name) >+@@ -312,7 +313,7 @@ send_headers(request_rec *r, struct sockbuff *s) >+ 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 +325,14 @@ send_headers(request_rec *r, struct sockbuff *s) >+ 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); >diff --git a/mod_scgi.spec b/mod_scgi.spec >index b2f9723..91926e3 100644 >--- a/mod_scgi.spec >+++ b/mod_scgi.spec >@@ -2,7 +2,7 @@ > > Name: mod_scgi > Version: 1.13 >-Release: 6%{?dist} >+Release: 7%{?dist} > Summary: Python implementation of the SCGI protocol > > Group: Applications/Internet >@@ -10,6 +10,7 @@ License: CNRI > URL: http://python.ca/scgi/ > Source0: http://python.ca/scgi/releases/scgi-%{version}.tar.gz > Source1: scgi.conf >+Patch0: mod_scgi-httpd24.patch > BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) > > BuildRequires: httpd-devel, python-devel, pcre-devel >@@ -23,11 +24,11 @@ but is designed to be easier to implement. > > %prep > %setup -q -n scgi-%{version} >- >+%patch0 -p1 -b .httpd24 > > %build > CFLAGS="%{optflags}" %{__python} setup.py build >-%{_sbindir}/apxs -c apache2/mod_scgi.c >+%{_bindir}/apxs -c apache2/mod_scgi.c > > %install > rm -rf $RPM_BUILD_ROOT >@@ -57,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT > > > %changelog >+* Wed Apr 04 2012 Jan Kaluza <jkaluza@redhat.com> - 1.13-7 >+- Fixed compilation issues with httpd-2.4 >+ > * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.13-6 > - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild > >-- >1.7.7.6 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 809705
: 575042