Merge branch 'branch_0.12.0'

Conflicts:
	configure
	configure.ac

diff --cc configure
index 775a476,365f0f0..a422515
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -19963,7 -20131,7 +20132,8 @@@ LIBS="${LIBS} `${APR_CONFIG} --ldflags
  LIBS="${LIBS} `${APU_CONFIG} --ldflags` `${APU_CONFIG} --libs` "
  LIBS="${LIBS} ${MYSQL_COOKIE_LIBS}"
  LIBS="${LIBS} ${MEMCACHE_COOKIE_LIBS} "
 +LIBS="${LIBS} css/src/.libs/libscss.a"
+ LIBS="${LIBS} -lcrypto -lssl "
  CFLAGS="${CFLAGS} `${WAND_CONFIG} --cppflags` `${WAND_CONFIG} --cflags`"
  CFLAGS="${CFLAGS} `${APR_CONFIG} --includes` `${APR_CONFIG} --cflags` `${APR_CONFIG} --cppflags`"
  CFLAGS="${CFLAGS} `${APU_CONFIG} --includes`"

diff --cc configure.ac
index 39ae2ce,d6edbef..00d0aa8
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -248,7 -276,7 +277,8 @@@ LIBS="${LIBS} `${APR_CONFIG} --ldflags
  LIBS="${LIBS} `${APU_CONFIG} --ldflags` `${APU_CONFIG} --libs` "
  LIBS="${LIBS} ${MYSQL_COOKIE_LIBS}"
  LIBS="${LIBS} ${MEMCACHE_COOKIE_LIBS} "
 +LIBS="${LIBS} css/src/.libs/libscss.a"
+ LIBS="${LIBS} -lcrypto -lssl "
  CFLAGS="${CFLAGS} `${WAND_CONFIG} --cppflags` `${WAND_CONFIG} --cflags`"
  CFLAGS="${CFLAGS} `${APR_CONFIG} --includes` `${APR_CONFIG} --cflags` `${APR_CONFIG} --cppflags`"
  CFLAGS="${CFLAGS} `${APU_CONFIG} --includes`"
@@@ -300,8 -337,7 +330,9 @@@ AC_SUBST(QDEFS
  AC_SUBST(DDEFS)
  AC_SUBST(LIBS)
  AC_SUBST(CFLAGS)
 +AC_SUBST(APR_CONFIG)
 +AC_SUBST(APU_CONFIG)
+ AC_SUBST(OPENSSL_PATH)
  
  
  AC_CONFIG_FILES([Makefile src/Makefile support/centos/mod-chxj.spec])

diff --cc src/Makefile.am
index 43d3e71,dbf0705..278d605
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -57,11 -54,8 +57,11 @@@ make_so
        @if test ! -L mod_chxj.so ; then ln -s .libs/libmod_chxj.so mod_chxj.so ; fi
  
  serf/.libs/libserf-0.a:
-       (cd serf; CFLAGS=-fPIC CXXFLAGS=-fPIC ./configure --enable-shared --with-apr=`dirname @APR_CONFIG@` --with-apr-util=`dirname @APU_CONFIG@`; make)
+       (cd serf; CFLAGS=-fPIC CXXFLAGS=-fPIC ./configure --enable-shared --with-apr=`dirname @APR_CONFIG@` --with-apr-util=`dirname @APU_CONFIG@` @OPENSSL_PATH@; make)
  
 +css/src/.libs/libscss.a:
 +      (cd css; ./configure --with-apr-config=@APR_CONFIG@ --with-apu-config=@APU_CONFIG@; make)
 +
  clean:
        rm -fr .libs
        rm -f *.o *.lo *.la

diff --cc src/Makefile.in
index dc55ad2,9c44963..389fbb8
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -928,11 -900,8 +929,11 @@@ make_so
        @if test ! -L mod_chxj.so ; then ln -s .libs/libmod_chxj.so mod_chxj.so ; fi
  
  serf/.libs/libserf-0.a:
-       (cd serf; CFLAGS=-fPIC CXXFLAGS=-fPIC ./configure --enable-shared --with-apr=`dirname @APR_CONFIG@` --with-apr-util=`dirname @APU_CONFIG@`; make)
+       (cd serf; CFLAGS=-fPIC CXXFLAGS=-fPIC ./configure --enable-shared --with-apr=`dirname @APR_CONFIG@` --with-apr-util=`dirname @APU_CONFIG@` @OPENSSL_PATH@; make)
  
 +css/src/.libs/libscss.a:
 +      (cd css; ./configure --with-apr-config=@APR_CONFIG@ --with-apu-config=@APU_CONFIG@; make)
 +
  clean:
        rm -fr .libs
        rm -f *.o *.lo *.la