Merge branch 'branch-6-4'

faegi · Feb 12, 2015 · 0542681 · 0542681
2 parents f3b37f1 + 01460ab
commit 0542681
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -123,7 +123,7 @@ option(WITH_LIBXML2 "Choose if libxml2 support should be built in (used for sos,
 option(WITH_THREAD_SAFETY "Choose if a thread-safe version of libmapserver should be built (only recommended for some mapscripts)" OFF)
 option(WITH_GIF "Enable GIF support (for PIXMAP loading)" ON)
 option(WITH_PYTHON "Enable Python mapscript support" OFF)
-option(WITH_PHP "Enable Python mapscript support" OFF)
+option(WITH_PHP "Enable PHP mapscript support" OFF)
 option(WITH_PERL "Enable Perl mapscript support" OFF)
 option(WITH_RUBY "Enable Ruby mapscript support" OFF)
 option(WITH_JAVA "Enable Java mapscript support" OFF)

diff --git a/cmake/FindAPACHE.cmake b/cmake/FindAPACHE.cmake
@@ -24,9 +24,8 @@ find_program(HTTPD_EXECUTABLE NAMES httpd
 )
 
 if(APXS_BIN)
-   EXEC_PROGRAM(${APXS_BIN}
-      ARGS -q LIBEXECDIR
-      OUTPUT_VARIABLE APACHE_MODULE_DIR )
+    EXECUTE_PROCESS(COMMAND ${APXS_BIN} -q LIBEXECDIR
+	    OUTPUT_VARIABLE APACHE_MODULE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif(APXS_BIN)
 
 include(FindPackageHandleStandardArgs)

diff --git a/mapwcs20.c b/mapwcs20.c
@@ -3310,6 +3310,9 @@ int msWCSGetCapabilities20(mapObj *map, cgiRequestObj *req,
     xmlNodePtr psExtensionNode = NULL;
     psNode = xmlNewChild(psRootNode, psWcsNs, BAD_CAST "ServiceMetadata", NULL);
 
+    /* Apply default formats */
+    msApplyDefaultOutputFormats(map);
+
     /* Add formats list */
     format_list = msWCSGetFormatsList20(map, NULL);
     msLibXml2GenerateList(psNode, psWcsNs, "formatSupported", format_list, ',');