Merge branch 'branch_0.13.0'

Conflicts:

	configure
	configure.ac
	include/config.h
	src/Makefile.am
	src/Makefile.in
	src/css/config.status
	src/css/configure
	src/css/configure.ac
	src/serf/Makefile.in
	support/centos/mod-chxj.spec

diff --cc src/Makefile.am
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/css/configure
index f397055,a4855c3..2b2fa72
--- 1/src/css/configure
--- 2/src/css/configure
+++ b/src/css/configure
@@@ -20163,20 -21268,17 +20163,23 @@@ if test "x$with_apu_config" != "x" ; th
    APU_CONFIG=$with_apu_config
  fi
  
++<<<<<<< HEAD:src/css/configure
 +CFLAGS="${CFLAGS} -DLIBICONV_PLUG -I/usr/local/include"
 +LIBS="${LIBS} `${APR_CONFIG} --ldflags` `${APR_CONFIG} --libs` "
 +LIBS="${LIBS} `${APU_CONFIG} --ldflags` `${APU_CONFIG} --libs` "
 +CFLAGS="${CFLAGS} `${APR_CONFIG} --includes` `${APR_CONFIG} --cflags` `${APR_CONFIG} --cppflags`"
 +CFLAGS="${CFLAGS} `${APU_CONFIG} --includes`"
 +
 +
++=======
++>>>>>>> branch_0.13.0:src/css/configure
  # Checks for typedefs, structures, and compiler characteristics.
 -{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
 -if test "${ac_cv_c_const+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
 +if ${ac_cv_c_const+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int

diff --cc src/css/configure.ac
index cd1da15,8f13279..2636bf0
--- 1/src/css/configure.ac
--- 2/src/css/configure.ac
+++ b/src/css/configure.ac
@@@ -85,7 -85,13 +85,13 @@@ if test "x$with_apu_config" != "x" ; th
    APU_CONFIG=$with_apu_config
  fi
  
- CFLAGS="${CFLAGS} -DLIBICONV_PLUG -I/usr/local/include"
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ 
+ # Checks for library functions.
+ AC_CHECK_FUNCS([memset strcasecmp strncasecmp])
+ 
 -CFLAGS="${CFLAGS} -DLIBICONV_PLUG "
++CFLAGS="${CFLAGS} -DLIBICONV_PLUG -l/usr/local/include "
  LIBS="${LIBS} `${APR_CONFIG} --ldflags` `${APR_CONFIG} --libs` "
  LIBS="${LIBS} `${APU_CONFIG} --ldflags` `${APU_CONFIG} --libs` "
  CFLAGS="${CFLAGS} `${APR_CONFIG} --includes` `${APR_CONFIG} --cflags` `${APR_CONFIG} --cppflags`"

diff --cc src/serf/Makefile.in
index a5579f2,373cf79..9e26544
--- 1/src/serf/Makefile.in
--- 2/src/serf/Makefile.in
+++ b/src/serf/Makefile.in
@@@ -20,13 -20,13 +20,23 @@@ TARGET_LIB=libserf-$(SERF_MAJOR_VERSION
  
  #TEST_OBJECTS = test/serf_get.lo test/serf_response.lo test/serf_request.lo \
  #               test/serf_spider.lo
++<<<<<<< HEAD:src/serf/Makefile.in
 +#
 +#TEST_SUITE_OBJECTS = test/CuTest.lo test/test_all.lo test/test_util.lo \
 +#                     test/test_buckets.lo test/test_context.lo \
 +#                     test/test_ssl.lo
 +#
 +#PROGRAMS = $(TEST_OBJECTS:.lo=) test/test_all
 +#
++=======
+ 
+ #TEST_SUITE_OBJECTS = test/CuTest.lo test/test_all.lo test/test_util.lo \
+ #                     test/test_buckets.lo test/test_context.lo \
+ #                     test/test_ssl.lo
+ 
+ #PROGRAMS = $(TEST_OBJECTS:.lo=) test/test_all
+ 
++>>>>>>> branch_0.13.0:src/serf/Makefile.in
  #TESTCASES = test/testcases/simple.response \
  #  test/testcases/chunked-empty.response test/testcases/chunked.response \
  #  test/testcases/chunked-trailers.response \

diff --cc support/centos/mod-chxj.spec
Simple merge