Merge remote-tracking branch 'upstream/main' into add-redis-cache

Author: bmanojlovic

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# point to OSGeo sponsor page
+github: [OSGeo]
+# point to PayPal directly
+custom: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MS7JAL9R268D2

.gitignore

@@ -1,3 +1,5 @@
 .*.swp
 nbproject/
 /build/
+/build_vagrant/
+/.vagrant/

.travis.yml

@@ -0,0 +1,56 @@
+matrix:
+  fast_finish: true
+  include:
+    - os: linux
+      dist: xenial
+      language: c
+      sudo: required
+      env:
+        - DISTRO=xenial
+        - BUILD_TYPE=maximum
+
+    - os: linux
+      dist: xenial
+      language: c
+      sudo: required
+      env:
+        - DISTRO=xenial
+        - BUILD_TYPE=minimum
+
+    - os: linux
+      language: c
+      sudo: required
+      env:
+        - DISTRO=precise
+        - BUILD_TYPE=maximum
+
+language: c
+
+before_install:
+  - sudo mv /etc/apt/sources.list.d/pgdg* /tmp
+  - sudo apt-get purge -y libgdal* libgeos* libspatialite*
+  - sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
+  - sudo apt-get update
+  - sudo apt-get install cmake libspatialite-dev libfcgi-dev libproj-dev libgeos-dev libgdal-dev libtiff-dev libgeotiff-dev apache2-dev libpcre3-dev libsqlite3-dev libdb-dev
+# For testing
+  - sudo apt-get install libxml2-utils apache2 gdal-bin
+
+script:
+  - mkdir build
+  - cd build
+  - if test "$BUILD_TYPE" = "maximum"; then cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DWITH_TIFF=ON -DWITH_GEOTIFF=ON -DWITH_TIFF_WRITE_SUPPORT=ON -DWITH_PCRE=ON -DWITH_SQLITE=ON -DWITH_BERKELEY_DB=ON; else cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DWITH_TIFF=OFF -DWITH_GEOTIFF=OFF -DWITH_TIFF_WRITE_SUPPORT=OFF -DWITH_PCRE=OFF -DWITH_SQLITE=OFF -DWITH_BERKELEY_DB=OFF -DWITH_GDAL=OFF -DWITH_GEOS=OFF -DWITH_FCGI=OFF -DWITH_CGI=OFF -DWITH_APACHE=OFF -DWITH_OGR=OFF -DWITH_MAPSERVER=OFF -DWITH_MAPCACHE_DETAIL=OFF; fi
+  - make -j3
+  - sudo make install
+# Only test with Apache 2.4
+  - if test "$DISTRO" = "xenial" -a "$BUILD_TYPE" = "maximum"; then cd ../tests; sh ./travis_setup.sh; sh ./run_tests.sh; fi
+
+
+#notifications:
+#  email:
+#    recipients:
+#      - [email protected]
+#  irc:
+#    channels:
+#      - "irc.freenode.org#mapserver"
+#    use_notice: true
+

CMakeLists.txt

@@ -1,22 +1,20 @@
 cmake_minimum_required (VERSION 2.6)
 
-project (MapCache)
+project (MapCache C)
 
 include(CheckFunctionExists)
 include(CheckIncludeFile)
 include(CheckCSourceCompiles)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") 
    add_definitions(-DDEBUG) 
 endif () 
 
 
 set (MAPCACHE_VERSION_MAJOR 1)
-set (MAPCACHE_VERSION_MINOR 3)
+set (MAPCACHE_VERSION_MINOR 11)
 set (MAPCACHE_VERSION_REVISION 0)
 
-
 if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
    set(CMAKE_INSTALL_LIBDIR lib)
 endif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
@@ -58,22 +56,37 @@ endmacro()
 
 check_function_exists("strncasecmp"  HAVE_STRNCASECMP)
 check_function_exists("symlink"  HAVE_SYMLINK)
-
+check_function_exists ("timegm" HAVE_TIMEGM)
+check_function_exists ("strptime" HAVE_STRPTIME)
 
 set(CMAKE_SKIP_BUILD_RPATH FALSE)
+if(APPLE)
+  set(CMAKE_MACOSX_RPATH ON)
+endif()
 set(CMAKE_LINK_INTERFACE_LIBRARY "")
 
 file(GLOB mapcache_SOURCES lib/*.c )
+file(GLOB mapcache_HEADERS include/*.h)
 
-add_library(mapcache SHARED ${mapcache_SOURCES})
+add_library(mapcache SHARED ${mapcache_SOURCES} ${mapcache_HEADERS})
 set_target_properties(mapcache PROPERTIES
   VERSION ${MAPCACHE_VERSION_STRING}
   SOVERSION 1
 )
 
+# Add compiler flags for warnings
+if(CMAKE_COMPILER_IS_GNUCC)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror=declaration-after-statement")
+endif()
+
+if(CMAKE_C_COMPILER_ID MATCHES "Clang")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror=declaration-after-statement -std=c89 -Wno-comment")
+endif()
+
 #options suported by the cmake builder
 option(WITH_PIXMAN "Use pixman for SSE optimized image manipulations" ON)
-option(WITH_SQLITE "Use sqlite as a cache backend" ON)
+option(WITH_SQLITE "Use sqlite as a cache/dimension backend" ON)
+option(WITH_POSTGRESQL "Use PostgreSQL as a dimension backend" OFF)
 option(WITH_BERKELEY_DB "Use Berkeley DB as a cache backend" OFF)
 option(WITH_MEMCACHE "Use memcache as a cache backend (requires recent apr-util)" OFF)
 option(WITH_REDIS "Use redis as a cache backend (requires hiredis library)" OFF)
@@ -82,11 +95,14 @@ option(WITH_TIFF_WRITE_SUPPORT "Enable (experimental) support for writable TIFF
 option(WITH_GEOTIFF "Allow GeoTIFF metadata creation for TIFF cache backends" OFF)
 option(WITH_PCRE "Use PCRE for regex tests" OFF)
 option(WITH_MAPSERVER "Enable (experimental) support for the mapserver library" OFF)
+option(WITH_RIAK "Use Riak as a cache backend" OFF)
+option(WITH_GDAL "Choose if GDAL raster support should be built in" ON)
+option(WITH_MAPCACHE_DETAIL "Build coverage analysis tool for SQLite caches" ON)
 
 find_package(PNG)
 if(PNG_FOUND)
   include_directories(${PNG_INCLUDE_DIR})
-  target_link_libraries(mapcache ${PNG_LIBRARY})
+  target_link_libraries(mapcache ${PNG_LIBRARIES})
 else(PNG_FOUND)
   report_mandatory_not_found(PNG)
 endif(PNG_FOUND)
@@ -162,12 +178,24 @@ if(WITH_PIXMAN)
   endif(PIXMAN_FOUND)
 endif (WITH_PIXMAN)
 
+if(WITH_GDAL)
+  find_package(GDAL)
+  if(GDAL_FOUND)
+    include_directories(${GDAL_INCLUDE_DIR})
+    target_link_libraries(mapcache ${GDAL_LIBRARY})
+    set (USE_GDAL 1)
+  else(GDAL_FOUND)
+    report_optional_not_found(GDAL)
+  endif(GDAL_FOUND)
+endif(WITH_GDAL)
+
 if(WITH_PCRE)
    find_package(PCRE)
   if(PCRE_FOUND)
     include_directories(${PCRE_INCLUDE_DIR})
     target_link_libraries(mapcache ${PCRE_LIBRARY})
     set (USE_PCRE 1)
+    add_definitions(-DPCRE_STATIC) 
   else(PCRE_FOUND)
     report_optional_not_found(PCRE)
   endif(PCRE_FOUND)
@@ -184,6 +212,17 @@ if(WITH_SQLITE)
   endif(SQLITE_FOUND)
 endif (WITH_SQLITE)
 
+if(WITH_POSTGRESQL)
+  find_package(PostgreSQL)
+  if(PostgreSQL_FOUND)
+    include_directories(${PostgreSQL_INCLUDE_DIR})
+    target_link_libraries(mapcache ${PostgreSQL_LIBRARY})
+    set (USE_POSTGRESQL 1)
+  else(POSTGRESQL_FOUND)
+    report_optional_not_found(POSTGRESQL)
+  endif(PostgreSQL_FOUND)
+endif (WITH_POSTGRESQL)
+
 if(WITH_BERKELEY_DB)
   if(NOT BERKELEYDB_FIND_VERSION)
     set(BERKELEYDB_FIND_VERSION "4.6")
@@ -240,6 +279,16 @@ if(WITH_MAPSERVER)
   endif(MAPSERVER_FOUND)
 endif (WITH_MAPSERVER)
 
+if(WITH_RIAK)
+  find_package(RIAK)
+  if(RIAK_FOUND)
+    include_directories(${RIAK_INCLUDE_DIR})
+    target_link_libraries(mapcache ${RIAK_LIBRARY})
+    set (USE_RIAK 1)
+  else(RIAK_FOUND)
+    report_optional_not_found(RIAK)
+  endif(RIAK_FOUND)
+endif (WITH_RIAK)
 
 if(UNIX)
 target_link_libraries(mapcache ${CMAKE_DL_LIBS} m )
@@ -265,7 +314,7 @@ macro(status_optional_component component enabled libpath)
   endif()
 endmacro()
 macro(status_optional_feature feature enabled)
-  if("${enabled}" EQUAL "1")
+  if("${enabled}" EQUAL "1" OR "${enabled}" STREQUAL "ON")
     message(STATUS "  * ${feature}: ENABLED")
   else()
     message(STATUS "  * ${feature}: disabled")
@@ -281,6 +330,7 @@ message(STATUS "  * Apr: ${APR_LIBRARY}")
 message(STATUS " * Optional components")
 status_optional_component("PIXMAN" "${USE_PIXMAN}" "${PIXMAN_LIBRARY}")
 status_optional_component("SQLITE" "${USE_SQLITE}" "${SQLITE_LIBRARY}")
+status_optional_component("POSTGRESQL" "${USE_POSTGRESQL}" "${PostgreSQL_LIBRARY}")
 status_optional_component("Berkeley DB" "${USE_BDB}" "${BERKELEYDB_LIBRARY}")
 status_optional_component("Memcache" "${USE_MEMCACHE}" "${APU_LIBRARY}")
 status_optional_component("Redis" "${USE_REDIS}" "${HIREDIS_LIBRARIES} ${HIREDIS_INCLUDE_DIR}")
@@ -289,10 +339,18 @@ status_optional_component("GeoTIFF" "${USE_GEOTIFF}" "${GEOTIFF_LIBRARY}")
 status_optional_component("Experimental TIFF write support" "${USE_TIFF_WRITE}" "${TIFF_LIBRARY}")
 status_optional_component("PCRE" "${USE_PCRE}" "${PCRE_LIBRARY}")
 status_optional_component("Experimental mapserver support" "${USE_MAPSERVER}" "${MAPSERVER_LIBRARY}")
+status_optional_component("RIAK" "${USE_RIAK}" "${RIAK_LIBRARY}")
+status_optional_component("GDAL" "${USE_GDAL}" "${GDAL_LIBRARY}")
+message(STATUS " * Optional features")
+status_optional_feature("MAPCACHE_DETAIL" "${WITH_MAPCACHE_DETAIL}")
 
 INSTALL(TARGETS mapcache DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 add_subdirectory(util)
 add_subdirectory(cgi)
 add_subdirectory(apache)
 add_subdirectory(nginx)
+
+if (WITH_MAPCACHE_DETAIL)
+  add_subdirectory(contrib/mapcache_detail)
+endif (WITH_MAPCACHE_DETAIL)

LICENSE

@@ -6,7 +6,7 @@
  * Author:   Thomas Bonfort and the MapServer team.
  *
  ******************************************************************************
- * Copyright (c) 1996-2012 Regents of the University of Minnesota.
+ * Copyright (c) 1996-2019 Regents of the University of Minnesota.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

MIGRATION_GUIDE.txt

@@ -0,0 +1,31 @@
+Migrating from Mapcache 1.8 to 1.10
+===================================
+
+* No backward compatibility issue is expected.
+  See [MapCache 1.10 Changelog](https://mapserver.org/development/changelog/mapcache/changelog-1-10.html)
+  for a list of bug fixes and new features.
+
+Migrating from Mapcache 1.6 to 1.8
+===================================
+
+* <dimensions type="time" ...>...<query>SQL</query> should be replaced by
+  <dimensions type="time" ...>...<validate_query>SQL</validate_query><list_query>...</list_query> or
+  <dimensions type="sqlite" time="true" ...>...<validate_query>SQL</validate_query><list_query>...</list_query>
+  (see [RFC-121](http://mapserver.org/development/rfc/ms-rfc-121.html) for full examples)
+
+Migrating from Mapcache 1.4 to 1.6
+===================================
+
+* The <timedimension> tileset child has been removed. Time dimensions are now added with <dimension type="time">
+
+* <dimension type="values" ...>val1,val2,val3</dimension> should be replaced by
+  <dimension type="values"><value>val1</value><value>val2</value><value>val3</value></dimension>
+
+* <dimension type="values" case_sensitive="true">...</dimension> should be replaced by
+  <dimension type="values"><case_sensitive>true</case_sensitive>....</dimension>
+
+* <dimension type="regex" ...>^abc$</dimension> should be replaced by
+  <dimension type="regex"><regex>^abc$</regex></dimension>
+
+* <dimension ... assembly="stack">...</dimension> should be replaced by
+  <dimensions><assembly_type>stack</assembly_type><dimension ...>....</dimension></dimensions>

README

@@ -0,0 +1,60 @@
+MapCache
+========
+
+| |Build Status| |Appveyor Build Status|
+
+-------
+Summary
+-------
+
+MapCache is a server that implements tile caching to speed up access to WMS layers. The primary objectives are to be fast and easily deployable, 
+while offering the essential features (and more!) expected from a tile caching solution.
+
+For more  information and complete documentation please 
+visit:
+
+  http://mapserver.org/mapcache/
+  
+Questions relating to MapCache use and development can be asked on the MapServer mailing lists:
+
+  http://www.mapserver.org/community/lists.html  
+  
+License
+-------
+
+::
+
+	/******************************************************************************
+	 *
+	 * Project:  MapServer
+	 * Purpose:  MapCache tile caching program.
+	 * Author:   Thomas Bonfort and the MapServer team.
+	 *
+	 ******************************************************************************
+	 * Copyright (c) 1996-2019 Regents of the University of Minnesota.
+	 *
+	 * Permission is hereby granted, free of charge, to any person obtaining a
+	 * copy of this software and associated documentation files (the "Software"),
+	 * to deal in the Software without restriction, including without limitation
+	 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+	 * and/or sell copies of the Software, and to permit persons to whom the
+	 * Software is furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies of this Software or works derived from this Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+	 * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+	 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+	 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+	 * DEALINGS IN THE SOFTWARE.
+	 *****************************************************************************/
+
+
+.. |Build Status| image:: https://travis-ci.org/mapserver/mapcache.svg?branch=master
+   :target: https://travis-ci.org/mapserver/mapcache
+
+.. |Appveyor Build Status| image:: https://ci.appveyor.com/api/projects/status/7al5utxjh83ig71v?svg=true
+   :target: https://ci.appveyor.com/project/mapserver/mapcache

README.rst

@@ -0,0 +1,27 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+require 'socket'
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.box = "precise64"
+  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
+
+  config.vm.hostname = "mapcache-vagrant"
+
+  config.vm.network :forwarded_port, guest: 80, host: 8080
+
+  config.vm.provider "virtualbox" do |v|
+     v.customize ["modifyvm", :id, "--memory", 1024, "--cpus", 2]
+     v.customize ["modifyvm", :id, "--ioapic", "on", "--largepages", "off", "--vtxvpid", "off"]
+     v.name = "mapcache-vagrant"
+   end
+
+  config.vm.provision "shell", path: "scripts/vagrant/virtualbox-fix.sh"
+  config.vm.provision "shell", path: "scripts/vagrant/packages.sh"
+  config.vm.provision "shell", path: "scripts/vagrant/mapcache.sh"
+
+end