perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From steve...@apache.org
Subject svn commit: r1503137 - /perl/modperl/branches/httpd24/xs/maps/apache2_functions.map
Date Mon, 15 Jul 2013 08:40:24 GMT
Author: stevehay
Date: Mon Jul 15 08:40:24 2013
New Revision: 1503137

URL: http://svn.apache.org/r1503137
Log:
Fix linker error when building Apache2::ServerUtil

The symbol ap_get_server_version was not being found because as noted in ap_mmn.h that function
was replaced by ap_get_server_banner and ap_get_server_description in httpd-2.3, so make the
necessary change in apache2_functions.map to reflect that.

Modified:
    perl/modperl/branches/httpd24/xs/maps/apache2_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=1503137&r1=1503136&r2=1503137&view=diff
==============================================================================
--- perl/modperl/branches/httpd24/xs/maps/apache2_functions.map (original)
+++ perl/modperl/branches/httpd24/xs/maps/apache2_functions.map Mon Jul 15 08:40:24 2013
@@ -188,9 +188,17 @@ MODULE=Apache2::ServerUtil   PACKAGE=Apa
 MODULE=Apache2::ServerUtil   PACKAGE=Apache2::ServerUtil
  ap_exists_config_define
  ap_server_root_relative | | p, fname=""
+#_if_ do {                                                                  \
+          Apache2::Build->build_config                                      \
+	      ->httpd_version =~ /^(\d+)\.(\d+)\.(\d+)/                     \
+          ? ($1*1000+$2)*1000+$3                                            \
+          : die "Cannot get httpd version";                                 \
+      } > 2003000
  ap_get_server_banner
  ap_get_server_description
+#_else_
  ap_get_server_version
+#_end_
 
 MODULE=Apache2::ServerUtil   PACKAGE=guess
  ap_error_log2stderr



Mime
View raw message