Commit 16211a8c authored by Joe Orton's avatar Joe Orton
Browse files

Define "state directory" for storing persistent child-writable state, 

with default from config.layout, configurable via DefaultStateDir.

* server/core.c (set_state_dir, ap_state_dir_relative):
  New functions.
  
* config.layout, acinclude.m4, Makefile.in, configure.in: Define
  statedir variables, drop davlockdb.

* include/ap_config_layout.h.in: Define DEFAULT_REL_STATEDIR,
  DEFAULT_EXP_STATEDIR in place of _DAVLOCKDB.

* include/ap_mmn.h: Bump MMN minor.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1842929 13f79535-47bb-0310-9956-ffa450edef68
parent 77cce57b

Makefile.in

+1 −0
Changes for Makefile.in: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ install-cgi: 
install-other:

	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)

	@test -d $(DESTDIR)$(runtimedir) || $(MKINSTALLDIRS) $(DESTDIR)$(runtimedir)

	@test -d $(DESTDIR)$(statedir) || $(MKINSTALLDIRS) $(DESTDIR)$(statedir)

	@for ext in dll x; do \

		file=apachecore.$$ext; \

		if test -f $$file; then \

acinclude.m4

+2 −2
Changes for acinclude.m4: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ AC_DEFUN([APACHE_GEN_CONFIG_VARS],[ 
  APACHE_SUBST(installbuilddir)

  APACHE_SUBST(runtimedir)

  APACHE_SUBST(proxycachedir)

  APACHE_SUBST(davlockdb)

  APACHE_SUBST(statedir)

  APACHE_SUBST(other_targets)

  APACHE_SUBST(progname)

  APACHE_SUBST(prefix)
@@ -876,7 +876,7 @@ AC_DEFUN([APACHE_EXPORT_ARGUMENTS],[ 
  APACHE_SUBST_EXPANDED_ARG(runtimedir)

  APACHE_SUBST_EXPANDED_ARG(logfiledir)

  APACHE_SUBST_EXPANDED_ARG(proxycachedir)

  APACHE_SUBST_EXPANDED_ARG(davlockdb)

  APACHE_SUBST_EXPANDED_ARG(statedir)

])



dnl

config.layout

+15 −0
Changes for config.layout: 15 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
    includedir:    ${prefix}/include

    localstatedir: ${prefix}

    runtimedir:    ${localstatedir}/logs

    statedir:      ${localstatedir}/state

    logfiledir:    ${localstatedir}/logs

    proxycachedir: ${localstatedir}/proxy

</Layout>
@@ -54,6 +55,7 @@ 
    includedir:    ${prefix}/include+

    localstatedir: ${prefix}/var+

    runtimedir:    ${localstatedir}/run

    statedir:      ${localstatedir}/state

    logfiledir:    ${localstatedir}/log

    proxycachedir: ${localstatedir}/proxy

</Layout>
@@ -78,6 +80,7 @@ 
    includedir:    /System/Library/Frameworks/Apache.framework/Versions/2.0/Headers

    localstatedir: /var

    runtimedir:    ${prefix}/Logs

    statedir:      ${prefix}/State

    logfiledir:    ${prefix}/Logs

    proxycachedir: ${prefix}/ProxyCache

</Layout>
@@ -102,6 +105,7 @@ 
    includedir:    ${prefix}/include+

    localstatedir: /var

    runtimedir:    ${localstatedir}/run

    statedir:      ${localstatedir}/state

    logfiledir:    ${localstatedir}/log+

    proxycachedir: ${runtimedir}/proxy

</Layout>
@@ -126,6 +130,7 @@ 
    includedir:    ${prefix}/include/apache

    localstatedir: /var

    runtimedir:    ${localstatedir}/run

    statedir:      ${localstatedir}/lib/httpd

    logfiledir:    ${localstatedir}/log/httpd

    proxycachedir: ${localstatedir}/cache/httpd

</Layout>
@@ -151,6 +156,7 @@ 
    includedir:    ${prefix}/include/httpd

    runtimedir:    /run/httpd

    logfiledir:    ${localstatedir}/log/httpd

    statedir:      ${localstatedir}/lib/httpd

    proxycachedir: ${localstatedir}/cache/httpd/proxy

</Layout>
@@ -175,6 +181,7 @@ 
    localstatedir: /var${prefix}

    runtimedir:    ${localstatedir}/run

    logfiledir:    ${localstatedir}/logs

    statedir:      ${localstatedir}/state

    proxycachedir: ${localstatedir}/proxy

</Layout>
@@ -197,6 +204,7 @@ 
    cgidir:        ${datadir}/cgi-bin

    includedir:    ${prefix}/include/apache

    localstatedir: /var/lib/httpd

    statedir:      ${localstatedir}

    runtimedir:    /var/run

    logfiledir:    /var/log/httpd

    proxycachedir: /var/cache/httpd
@@ -223,6 +231,7 @@ 
    localstatedir: /var

    runtimedir:    ${localstatedir}/run

    logfiledir:    ${localstatedir}/log/httpd

    statedir:      ${prefix}/state

    proxycachedir: ${localstatedir}/proxy

</Layout>
@@ -246,6 +255,7 @@ 
    includedir:    ${exec_prefix}/include

    localstatedir: ${prefix}

    runtimedir:    /var/run

    statedir:      ${datadir}/state

    logfiledir:    ${datadir}/logs

    proxycachedir: ${datadir}/proxy

</Layout>
@@ -271,6 +281,7 @@ 
    localstatedir: ${prefix}

    runtimedir:    ${prefix}/logs

    logfiledir:    ${prefix}/logs

    statedir:      ${prefix}/state

    proxycachedir: ${prefix}/proxy

</Layout>
@@ -315,6 +326,7 @@ 
    cgidir:        ${prefix}/usr/lib/cgi-bin

    includedir:    ${exec_prefix}/include/apache2

    localstatedir: ${prefix}/var/lock/apache2

    statedir:      ${prefix}/var/lib/apache2

    runtimedir:    ${prefix}/var/run/apache2

    logfiledir:    ${prefix}/var/log/apache2

    proxycachedir: ${prefix}/var/cache/apache2/proxy
@@ -343,6 +355,7 @@ 
    manualdir:     ${datadir}/manual

    cgidir:        ${datadir}/cgi-bin

    runtimedir:    ${localstatedir}/run

    runtimedir:    ${localstatedir}/lib/httpd

    logfiledir:    ${localstatedir}/log/httpd

    proxycachedir: ${localstatedir}/cache/httpd/cache-root

</Layout>
@@ -366,6 +379,7 @@ 
    manualdir:     ${prefix}/manual

    includedir:    ${prefix}/include

    localstatedir: /var/httpd

    statedir:      ${localstatedir}/state

    runtimedir:    ${localstatedir}/run

    logfiledir:    ${localstatedir}/logs

    proxycachedir: ${localstatedir}/proxy
@@ -391,6 +405,7 @@ 
    includedir:      ${prefix}/include/httpd

    localstatedir:   /var

    runtimedir:      ${localstatedir}/run/httpd

    statedir:        ${localstatedir}/lib/httpd

    logfiledir:      ${localstatedir}/log/httpd

    proxycachedir:   ${localstatedir}/cache/httpd

</Layout>

configure.in

+1 −1
Changes for configure.in: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ dnl Something seems broken here. 
AC_PREFIX_DEFAULT(/usr/local/apache2)



dnl Get the layout here, so we can pass the required variables to apr

APR_ENABLE_LAYOUT(Apache, [errordir iconsdir htdocsdir cgidir])

APR_ENABLE_LAYOUT(Apache, [errordir iconsdir htdocsdir cgidir statedir])



dnl reparse the configure arguments.

APR_PARSE_ARGUMENTS

include/ap_config_layout.h.in

+2 −2
Changes for include/ap_config_layout.h.in: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
#define DEFAULT_REL_LOGFILEDIR "@rel_logfiledir@"

#define DEFAULT_EXP_PROXYCACHEDIR "@exp_proxycachedir@"

#define DEFAULT_REL_PROXYCACHEDIR "@rel_proxycachedir@"

#define DEFAULT_EXP_DAVLOCKDB "@exp_davlockdb@"

#define DEFAULT_REL_DAVLOCKDB "@rel_davlockdb@"

#define DEFAULT_EXP_STATEDIR "@exp_statedir@"

#define DEFAULT_REL_STATEDIR "@rel_statedir@"



#endif /* AP_CONFIG_LAYOUT_H */