Merge branch 'branch_0.12.0' into branch_0.13.0

Conflicts:
	configure.ac

diff --cc configure
Simple merge

diff --cc configure.ac
index 00d0aa8,66126b4..029b383
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -295,8 -293,24 +295,25 @@@ APR_HEADER_DIR="`${APR_CONFIG} --includ
  AC_CHECK_HEADERS([apr_shm.h apr_global_mutex.h])
  AC_CHECK_HEADERS([apr.h])
  AC_CHECK_HEADERS([ap_config.h])
- AC_CHECK_HEADERS([ap_regex.h],use_pcre_flag="no",use_pcre_flag="yes")
 +AC_CHECK_HEADERS([libgen.h])
+ #AC_CHECK_HEADERS([ap_regex.h],
+ #  AC_DEFINE([HAVE_AP_REGEX_H], [], [Define to 1 if you have the <ap_regex.h> header file.]),[],
+ #[[
+ ##ifdef HAVE_APR_H
+ ##include "apr.h"
+ ##endif
+ ##ifdef HAVE_AP_CONFIG_H
+ ##include "ap_config.h"
+ ##endif
+ #]])
+ AC_CHECK_HEADERS([ap_regex.h],use_pcre_flag="no",use_pcre_flag="yes",
+ [[#ifdef HAVE_APR_H
+ # include "apr.h"
+ #endif
+ #ifdef HAVE_AP_CONFIG_H
+ # include "ap_config.h"
+ #endif
+ ]])
  if test "x$use_pcre_flag" = "xyes" ; then
    if test "x$with_pcre_config" = "x" ; then
      AC_PATH_PROG(PCRE_CONFIG, pcre-config, no, /usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin)

diff --cc src/chxj_chtml10.c
Simple merge

diff --cc src/chxj_chtml20.c
Simple merge

diff --cc src/chxj_chtml30.c
Simple merge

diff --cc src/chxj_chtml40.c
Simple merge

diff --cc src/chxj_chtml50.c
Simple merge

diff --cc src/chxj_jhtml.c
Simple merge

diff --cc src/chxj_jxhtml.c
Simple merge

diff --cc src/chxj_xhtml_mobile_1_0.c
Simple merge

diff --cc src/mod_chxj.c
Simple merge

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