* 2005/3/27 apr-configを使用するよう、修正。

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@54 1a406e8e-add9-4483-a2c8-d8cac5b7c224

diff --git a/README b/README
index c427efb..bd48ad1 100644 (file)
--- a/README
+++ b/README
@@ -115,7 +115,6 @@ Table of contents
 
     ʸ»ú¥³¡¼¥É¤Ï¡¢Shift_JIS¤Î¤ßÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
 
-
   2-4. ³¨Ê¸»ú
 
     i-modeÂбþ¤Î³¨Ê¸»ú¤ò¥Ð¥¤¥Ê¥ê¥³¡¼¥É¡¢¤Þ¤¿¤Ï¡¢£±£°¿Ê»²¾Èʸ»úÎó¤Çµ­½Ò¤·¤Æ¤ª¤¯¤È¡¢

diff --git a/configure.ac b/configure.ac
index bf4966b..06f8025 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -87,7 +87,7 @@ AC_SUBST(CFLAGS)
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([string.h strings.h unistd.h fcntl.h sys/types.h sys/stat.h sys/mman.h])
+AC_CHECK_HEADERS([string.h strings.h unistd.h fcntl.h sys/types.h sys/stat.h sys/mman.h libgen.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST

diff --git a/src/chxj_specified_device.c b/src/chxj_specified_device.c
index 51624ac..f875532 100644 (file)
--- a/src/chxj_specified_device.c
+++ b/src/chxj_specified_device.c
@@ -38,16 +38,21 @@ chxj_specified_device(request_rec* r, const char* user_agent)
   int rtn;
   char* device_id;
 
+  ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "start chxj_specified_device()");
   conf = ap_get_module_config(r->per_dir_config, &chxj_module);
   for (dtl = conf->devices; dtl; dtl = dtl->next) 
   {
     if (dtl->pattern == NULL)
     {
+      ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "pattern is null");
       continue;
     }
+
+    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "pattern is [%s]", dtl->pattern);
     regexp = ap_pregcomp(r->pool, (const char*)dtl->pattern, AP_REG_EXTENDED|AP_REG_ICASE);
     if (regexp == NULL) 
     {
+      ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "compile failed.");
       return returnType;
     }
 
@@ -82,9 +87,11 @@ chxj_specified_device(request_rec* r, const char* user_agent)
     ap_pregfree(r->pool, regexp);
     if (returnType != &UNKNOWN_DEVICE) 
     {
+      ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "end chxj_specified_device()");
       return returnType;
     }
   }
+  ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "end chxj_specified_device()");
 
   return returnType;
 }

diff --git a/src/mod_chxj.c b/src/mod_chxj.c
index 187d5cc..b667959 100644 (file)
--- a/src/mod_chxj.c
+++ b/src/mod_chxj.c
@@ -829,6 +829,7 @@ cmd_set_image_copyright(cmd_parms *parms, void *mconfig, const char* arg)
   return NULL;
 }
 
+
 static const command_rec cmds[] = {
   AP_INIT_TAKE1(
     "ChxjLoadDeviceData",