[wso2-wsf-cpp/rawhide] Added patch for 2.4 httpd API change
Peter MacKinnon
pmackinn at fedoraproject.org
Wed Jul 11 15:30:34 UTC 2012
commit 8aee8095febd6882d3379838f3223332ebc406e8
Author: Peter MacKinnon <pmackinn at redhat.com>
Date: Wed Jul 11 10:56:49 2012 -0400
Added patch for 2.4 httpd API change
2.4_client_ip_API_change.patch | 16 ++++++++++++++++
wso2-wsf-cpp.spec | 9 ++++++++-
2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/2.4_client_ip_API_change.patch b/2.4_client_ip_API_change.patch
new file mode 100644
index 0000000..39c42be
--- /dev/null
+++ b/2.4_client_ip_API_change.patch
@@ -0,0 +1,16 @@
+diff --git a/wsf_c/axis2c/src/core/transport/http/server/apache2/apache2_worker.c b/wsf_c/axis2c/src/core/transport/http/server/apache2/apache2_worker.c
+index dac9c4e..e92fca6 100644
+--- a/wsf_c/axis2c/src/core/transport/http/server/apache2/apache2_worker.c
++++ b/wsf_c/axis2c/src/core/transport/http/server/apache2/apache2_worker.c
+@@ -266,7 +266,11 @@ axis2_apache2_worker_process_request(
+ out_stream = axutil_stream_create_basic(env);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Client HTTP version %s", http_version);
+
++ #if AP_SERVER_MINORVERSION_NUMBER >= 2 && AP_SERVER_MINORVERSION_NUMBER > 2
++ peer_ip = request->connection->client_ip;
++ #else
+ peer_ip = request->connection->remote_ip;
++ #endif
+
+ if(peer_ip)
+ {
diff --git a/wso2-wsf-cpp.spec b/wso2-wsf-cpp.spec
index 44a3383..1f6a4e8 100644
--- a/wso2-wsf-cpp.spec
+++ b/wso2-wsf-cpp.spec
@@ -24,7 +24,7 @@
Name: %{pkg_name}
Summary: WSO2 Web Services Framework for C++
Version: %{pkg_ver}
-Release: 7%{?dist}
+Release: 8%{?dist}
Group: Development/Tools
License: ASL 2.0
URL: http://wso2.org/library/wsf/cpp
@@ -52,6 +52,9 @@ Patch3: generic_streams_for_ssl.patch
# Fix free of static buffer
# https://wso2.org/jira/browse/WSFCPP-138
Patch4: prevent_free_of_static_chars.patch
+# 2.4 client_ip API change
+# https://bugzilla.redhat.com/show_bug.cgi?id=833173
+Patch5: 2.4_client_ip_API_change.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: openssl-devel
BuildRequires: httpd-devel
@@ -474,6 +477,7 @@ chmod a-x wsf_c/wsclient/LICENSE
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
%if %{build_sandesha2}
@@ -618,6 +622,9 @@ mv -f %{buildroot}/%{_includedir}/*.h %{buildroot}/%{_includedir}/%{pkg_name}
rm -rf %{buildroot}
%changelog
+* Wed Jul 11 2012 Pete MacKinnon <pmackinn at redhat> - 2.1.0-8
+- Added patch for 2.4 httpd API change
+
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-7
- Rebuilt for c++ ABI breakage
More information about the scm-commits
mailing list