Author: jkaluza
Date: Mon Jul 1 12:38:14 2013
New Revision: 1498411
URL: http://svn.apache.org/r1498411
Log:
Use conditionals in xs/maps to not use httpd-2.4 api with httpd-2.2
Modified:
perl/modperl/branches/httpd24/xs/maps/apache2_functions.map
perl/modperl/branches/httpd24/xs/maps/apache2_structures.map
perl/modperl/branches/httpd24/xs/maps/modperl_functions.map
Modified: perl/modperl/branches/httpd24/xs/maps/apache2_functions.map
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/httpd24/xs/maps/apache2_functions.map?rev=1498411&r1=1498410&r2=1498411&view=diff
==============================================================================
--- perl/modperl/branches/httpd24/xs/maps/apache2_functions.map (original)
+++ perl/modperl/branches/httpd24/xs/maps/apache2_functions.map Mon Jul 1
12:38:14 2013
@@ -37,7 +37,14 @@
MODULE=Apache2::RequestUtil
ap_get_status_line
+#_if_ do { \
+ Apache2::Build->build_config \
+ ->httpd_version =~ /^(\d+)\.(\d+)\.(\d+)/ \
+ ? ($1*1000+$2)*1000+$3 \
+ : die "Cannot get httpd version"; \
+ } > 2003000
ap_register_auth_provider | mpxs_ | ...
+#_end_
MODULE=Apache2::RequestUtil PACKAGE=guess
ap_psignature | | r, prefix
@@ -169,7 +176,14 @@ MODULE=Apache2::ServerUtil PACKAGE=Apa
int:DEFINE_method_register | | server_rec *:s, const char *:methname
~add_version_component
void:DEFINE_add_version_component | | server_rec *:s, const char *:component
+#_if_ do { \
+ Apache2::Build->build_config \
+ ->httpd_version =~ /^(\d+)\.(\d+)\.(\d+)/ \
+ ? ($1*1000+$2)*1000+$3 \
+ : die "Cannot get httpd version"; \
+ } > 2003000
mpxs_Apache2__ServerRec_loglevel | | server_rec *:s, loglevel=NULL
+#_end_
MODULE=Apache2::ServerUtil PACKAGE=Apache2::ServerUtil
ap_exists_config_define
@@ -543,5 +557,12 @@ MODULE=Apache2::MPM PACKAGE=Apache2::M
?ap_mpm_set_scoreboard
?ap_listen_pre_config
+#_if_ do { \
+ Apache2::Build->build_config \
+ ->httpd_version =~ /^(\d+)\.(\d+)\.(\d+)/ \
+ ? ($1*1000+$2)*1000+$3 \
+ : die "Cannot get httpd version"; \
+ } > 2003000
MODULE=Apache2::Provider
ap_register_provider
+#_end_
Modified: perl/modperl/branches/httpd24/xs/maps/apache2_structures.map
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/httpd24/xs/maps/apache2_structures.map?rev=1498411&r1=1498410&r2=1498411&view=diff
==============================================================================
--- perl/modperl/branches/httpd24/xs/maps/apache2_structures.map (original)
+++ perl/modperl/branches/httpd24/xs/maps/apache2_structures.map Mon Jul 1
12:38:14 2013
@@ -83,8 +83,15 @@ IGNORE: ap_LINK_ ap_filter_func ap_bucke
proto_output_filters
proto_input_filters
? eos_sent
+#_if_ do { \
+ Apache2::Build->build_config \
+ ->httpd_version =~ /^(\d+)\.(\d+)\.(\d+)/ \
+ ? ($1*1000+$2)*1000+$3 \
+ : die "Cannot get httpd version"; \
+ } > 2003000
< useragent_addr
useragent_ip
+#_end_
</request_rec>
<server_rec>
@@ -94,12 +101,28 @@ IGNORE: ap_LINK_ ap_filter_func ap_bucke
- defn_line_number
% server_admin
% server_hostname
+#_if_ do { \
+ Apache2::Build->build_config \
+ ->httpd_version =~ /^(\d+)\.(\d+)\.(\d+)/ \
+ ? ($1*1000+$2)*1000+$3 \
+ : die "Cannot get httpd version"; \
+ } > 2003000
% server_scheme
+#_end_
$ port
% error_fname
$ error_log
$ loglevel
+#_if_ do { \
+ Apache2::Build->build_config \
+ ->httpd_version =~ /^(\d+)\.(\d+)\.(\d+)/ \
+ ? ($1*1000+$2)*1000+$3 \
+ : die "Cannot get httpd version"; \
+ } > 2003000
~ is_virtual
+#_else_
+< is_virtual
+#_end_
< module_config
< lookup_defaults
< addrs
@@ -114,7 +137,14 @@ $ keep_alive
$ limit_req_line
$ limit_req_fieldsize
$ limit_req_fields
+#_if_ do { \
+ Apache2::Build->build_config \
+ ->httpd_version =~ /^(\d+)\.(\d+)\.(\d+)/ \
+ ? ($1*1000+$2)*1000+$3 \
+ : die "Cannot get httpd version"; \
+ } > 2003000
context
+#_end_
</server_rec>
<conn_rec>
@@ -122,8 +152,15 @@ $ limit_req_fields
< base_server
> vhost_lookup_data
< local_addr
+#_if_ do { \
+ Apache2::Build->build_config \
+ ->httpd_version =~ /^(\d+)\.(\d+)\.(\d+)/ \
+ ? ($1*1000+$2)*1000+$3 \
+ : die "Cannot get httpd version"; \
+ } > 2003000
< client_addr
client_ip
+#_end_
< local_ip
< local_host
< remote_addr
@@ -141,8 +178,15 @@ $ limit_req_fields
output_filters
< sbh
< bucket_alloc
+#_if_ do { \
+ Apache2::Build->build_config \
+ ->httpd_version =~ /^(\d+)\.(\d+)\.(\d+)/ \
+ ? ($1*1000+$2)*1000+$3 \
+ : die "Cannot get httpd version"; \
+ } > 2003000
< log
< log_id
+#_end_
</conn_rec>
!<server_addr_rec>
Modified: perl/modperl/branches/httpd24/xs/maps/modperl_functions.map
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/httpd24/xs/maps/modperl_functions.map?rev=1498411&r1=1498410&r2=1498411&view=diff
==============================================================================
--- perl/modperl/branches/httpd24/xs/maps/modperl_functions.map (original)
+++ perl/modperl/branches/httpd24/xs/maps/modperl_functions.map Mon Jul 1
12:38:14 2013
@@ -21,9 +21,16 @@ MODULE=Apache2::RequestRec PACKAGE=Apa
mpxs_Apache2__RequestRec_finfo | | r, finfo=NULL
mpxs_Apache2__RequestRec_handler | | ...
mpxs_Apache2__RequestRec_content_languages | | r, languages=(SV *)NULL
-,
+
+#_if_ do { \
+ Apache2::Build->build_config \
+ ->httpd_version =~ /^(\d+)\.(\d+)\.(\d+)/ \
+ ? ($1*1000+$2)*1000+$3 \
+ : die "Cannot get httpd version"; \
+ } > 2003000
MODULE=Apache2::ServerRec PACKAGE=Apache2::ServerRec
mpxs_Apache2__ServerRec_is_virtual | | server_rec *:s, val=(SV *)NULL
+#_end_
MODULE=Apache2::RequestUtil PACKAGE=guess
mpxs_Apache2__RequestRec_push_handlers
