[mod_vhostdb*] rename http_vhostdb->mod_vhostdb_api

rename http_vhostdb.[ch] -> mod_vhostdb_api.[ch]

src/CMakeLists.txt

@@ -839,7 +839,7 @@ add_and_install_library(mod_status mod_status.c)
 add_and_install_library(mod_uploadprogress mod_uploadprogress.c)
 add_and_install_library(mod_userdir mod_userdir.c)
 add_and_install_library(mod_usertrack mod_usertrack.c)
-add_and_install_library(mod_vhostdb "mod_vhostdb.c;http_vhostdb.c")
+add_and_install_library(mod_vhostdb "mod_vhostdb.c;mod_vhostdb_api.c")
 add_and_install_library(mod_webdav mod_webdav.c)
 add_and_install_library(mod_wstunnel mod_wstunnel.c)
 

src/Makefile.am

@@ -173,7 +173,7 @@ mod_trigger_b4_dl_la_LIBADD = $(GDBM_LIB) $(MEMCACHED_LIB) $(common_libadd)
 endif
 
 lib_LTLIBRARIES += mod_vhostdb.la
-mod_vhostdb_la_SOURCES = mod_vhostdb.c http_vhostdb.c
+mod_vhostdb_la_SOURCES = mod_vhostdb.c mod_vhostdb_api.c
 mod_vhostdb_la_LDFLAGS = $(common_module_ldflags)
 mod_vhostdb_la_LIBADD = $(common_libadd)
 
@@ -464,7 +464,7 @@ hdr = base64.h buffer.h burl.h network.h log.h http_kv.h keyvalue.h \
 	algo_md.h algo_md5.h algo_sha1.h algo_splaytree.h algo_xxhash.h \
 	ck.h \
 	http_cgi.h http_date.h \
-	http_header.h http_range.h http_vhostdb.h \
+	http_header.h http_range.h \
 	fdevent.h gw_backend.h connections.h base.h base_decls.h stat_cache.h \
 	plugin.h plugin_config.h \
 	http_etag.h array.h vector.h \
@@ -479,6 +479,7 @@ hdr = base64.h buffer.h burl.h network.h log.h http_kv.h keyvalue.h \
 	sock_addr.h status_counter.h \
 	mod_auth_api.h \
 	mod_magnet_cache.h \
+	mod_vhostdb_api.h \
 	ls-hpack/lshpack.h \
 	ls-hpack/lsxpack_header.h \
 	ls-hpack/huff-tables.h \
@@ -525,6 +526,7 @@ lighttpd_SOURCES = \
   mod_userdir.c \
   mod_usertrack.c \
   mod_vhostdb.c \
+  mod_vhostdb_api.c \
   mod_webdav.c
 lighttpd_CPPFLAGS = \
   -DLIGHTTPD_STATIC \

src/SConscript

@@ -128,7 +128,7 @@ modules = {
 	'mod_uploadprogress' : { 'src' : [ 'mod_uploadprogress.c' ] },
 	'mod_userdir' : { 'src' : [ 'mod_userdir.c' ] },
 	'mod_usertrack' : { 'src' : [ 'mod_usertrack.c' ], 'lib' : [ env['LIBCRYPTO'] ] },
-	'mod_vhostdb' : { 'src' : [ 'mod_vhostdb.c', 'http_vhostdb.c' ] },
+	'mod_vhostdb' : { 'src' : [ 'mod_vhostdb.c', 'mod_vhostdb_api.c' ] },
 	'mod_webdav' : { 'src' : [ 'mod_webdav.c' ], 'lib' : [ env['LIBXML2'], env['LIBSQLITE3'], env['LIBUUID'] ] },
 	'mod_wstunnel' : { 'src' : [ 'mod_wstunnel.c' ], 'lib' : [ env['LIBCRYPTO'] ] },
 }

src/meson.build

@@ -1010,7 +1010,7 @@ modules = [
 	[ 'mod_uploadprogress', [ 'mod_uploadprogress.c' ] ],
 	[ 'mod_userdir', [ 'mod_userdir.c' ] ],
 	[ 'mod_usertrack', [ 'mod_usertrack.c' ], libcrypto ],
-	[ 'mod_vhostdb', [ 'mod_vhostdb.c', 'http_vhostdb.c' ] ],
+	[ 'mod_vhostdb', [ 'mod_vhostdb.c', 'mod_vhostdb_api.c' ] ],
 	[ 'mod_webdav', [ 'mod_webdav.c' ], libsqlite3 + libuuid + libxml2 + libelftc ],
 	[ 'mod_wstunnel', [ 'mod_wstunnel.c' ], libcrypto ],
 ]

src/mod_vhostdb.c

@@ -6,17 +6,17 @@
  */
 #include "first.h"
 
+#include <stdlib.h>
+#include <string.h>
+
+#include "mod_vhostdb_api.h"
 #include "base.h"
 #include "plugin.h"
 #include "plugin_config.h"
-#include "http_vhostdb.h"
 #include "log.h"
 #include "stat_cache.h"
 #include "algo_splaytree.h"
 
-#include <stdlib.h>
-#include <string.h>
-
 /**
  * vhostdb framework
  */

src/mod_vhostdb_api.c

@@ -1,12 +1,12 @@
 /*
- * http_vhostdb - virtual hosts mapping backend registration
+ * http_vhostdb_api - virtual hosts mapping backend registration
  *
  * Copyright(c) 2017 Glenn Strauss gstrauss()gluelogic.com  All rights reserved
  * License: BSD 3-clause (same as lighttpd)
  */
 #include "first.h"
 
-#include "http_vhostdb.h"
+#include "mod_vhostdb_api.h"
 
 #include <string.h>
 

src/mod_vhostdb_api.h

@@ -1,5 +1,11 @@
-#ifndef _HTTP_VHOST_H_
-#define _HTTP_VHOST_H_
+/*
+ * mod_vhostdb_api - virtual hosts mapping backend registration
+ *
+ * Copyright(c) 2017 Glenn Strauss gstrauss()gluelogic.com  All rights reserved
+ * License: BSD 3-clause (same as lighttpd)
+ */
+#ifndef INCLUDED_MOD_VHOSTDB_API_H
+#define INCLUDED_MOD_VHOSTDB_API_H
 #include "first.h"
 
 #include "base_decls.h"

src/mod_vhostdb_dbi.c

@@ -6,13 +6,13 @@
  */
 #include "first.h"
 
-#include <dbi/dbi.h>
-
 #include <string.h>
 #include <stdlib.h>
 
+#include <dbi/dbi.h>
+
+#include "mod_vhostdb_api.h"
 #include "base.h"
-#include "http_vhostdb.h"
 #include "fdevent.h"
 #include "log.h"
 #include "plugin.h"

src/mod_vhostdb_ldap.c

@@ -6,13 +6,13 @@
  */
 #include "first.h"
 
-#include <ldap.h>
-
 #include <string.h>
 #include <stdlib.h>
 
+#include <ldap.h>
+
+#include "mod_vhostdb_api.h"
 #include "base.h"
-#include "http_vhostdb.h"
 #include "log.h"
 #include "plugin.h"
 

src/mod_vhostdb_mysql.c

@@ -6,13 +6,13 @@
  */
 #include "first.h"
 
-#include <mysql.h>
-
 #include <string.h>
 #include <stdlib.h>
 
+#include <mysql.h>
+
+#include "mod_vhostdb_api.h"
 #include "base.h"
-#include "http_vhostdb.h"
 #include "fdevent.h"
 #include "log.h"
 #include "plugin.h"

src/mod_vhostdb_pgsql.c

@@ -6,13 +6,13 @@
  */
 #include "first.h"
 
-#include <libpq-fe.h>
-
 #include <string.h>
 #include <stdlib.h>
 
+#include <libpq-fe.h>
+
+#include "mod_vhostdb_api.h"
 #include "base.h"
-#include "http_vhostdb.h"
 #include "log.h"
 #include "plugin.h"