From b93a991c9fb4797a3bbcd05448b7bf896335dbca Mon Sep 17 00:00:00 2001 From: Atsushi Konno Date: Sun, 27 Feb 2011 21:29:21 +0900 Subject: [PATCH] * version up. - 0.12.38rc8 -> 0.12.38rc9 - for LOAD --- configure | 20 ++++++++++---------- configure.ac | 2 +- include/config.h | 6 +++--- src/chxj_img_conv_format.c | 15 +++++++++------ src/chxj_load_device_data.c | 3 ++- src/chxj_specified_device.c | 3 ++- src/mod_chxj.c | 2 +- support/centos/mod-chxj.spec | 2 +- 8 files changed, 29 insertions(+), 24 deletions(-) diff --git a/configure b/configure index 5ca55979..deb90811 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for mod_chxj 0.12.38rc8. +# Generated by GNU Autoconf 2.61 for mod_chxj 0.12.38rc9. # # Report bugs to . # @@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='mod_chxj' PACKAGE_TARNAME='mod_chxj' -PACKAGE_VERSION='0.12.38rc8' -PACKAGE_STRING='mod_chxj 0.12.38rc8' +PACKAGE_VERSION='0.12.38rc9' +PACKAGE_STRING='mod_chxj 0.12.38rc9' PACKAGE_BUGREPORT='konn@users.sourceforge.jp' ac_unique_file="src/mod_chxj.c" @@ -1411,7 +1411,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures mod_chxj 0.12.38rc8 to adapt to many kinds of systems. +\`configure' configures mod_chxj 0.12.38rc9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1482,7 +1482,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of mod_chxj 0.12.38rc8:";; + short | recursive ) echo "Configuration of mod_chxj 0.12.38rc9:";; esac cat <<\_ACEOF @@ -1600,7 +1600,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -mod_chxj configure 0.12.38rc8 +mod_chxj configure 0.12.38rc9 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1614,7 +1614,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by mod_chxj $as_me 0.12.38rc8, which was +It was created by mod_chxj $as_me 0.12.38rc9, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2432,7 +2432,7 @@ fi # Define the identity of the package. PACKAGE=mod_chxj - VERSION=0.12.38rc8 + VERSION=0.12.38rc9 cat >>confdefs.h <<_ACEOF @@ -22602,7 +22602,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mod_chxj $as_me 0.12.38rc8, which was +This file was extended by mod_chxj $as_me 0.12.38rc9, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22655,7 +22655,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -mod_chxj config.status 0.12.38rc8 +mod_chxj config.status 0.12.38rc9 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 2271b86f..bb02117a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT([mod_chxj],[0.12.38rc8],[konn@users.sourceforge.jp]) +AC_INIT([mod_chxj],[0.12.38rc9],[konn@users.sourceforge.jp]) AC_PREREQ(2.59) AC_CONFIG_SRCDIR([src/mod_chxj.c]) AC_CANONICAL_TARGET diff --git a/include/config.h b/include/config.h index eb3db8ec..68645374 100644 --- a/include/config.h +++ b/include/config.h @@ -96,19 +96,19 @@ #define PACKAGE_NAME "mod_chxj" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "mod_chxj 0.12.38rc8" +#define PACKAGE_STRING "mod_chxj 0.12.38rc9" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "mod_chxj" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.12.38rc8" +#define PACKAGE_VERSION "0.12.38rc9" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "0.12.38rc8" +#define VERSION "0.12.38rc9" /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ diff --git a/src/chxj_img_conv_format.c b/src/chxj_img_conv_format.c index 3139f4a7..b6b93879 100644 --- a/src/chxj_img_conv_format.c +++ b/src/chxj_img_conv_format.c @@ -511,7 +511,7 @@ s_create_cache_file(request_rec *r, /*------------------------------------------------------------------------*/ rv = apr_file_open(&fin, r->filename, - APR_READ|APR_BINARY , + APR_FOPEN_READ | APR_FOPEN_BINARY | APR_FOPEN_BUFFERED | APR_FOPEN_SHARELOCK | APR_FOPEN_SENDFILE_ENABLED, APR_OS_DEFAULT, r->pool); if (rv != APR_SUCCESS) { @@ -808,8 +808,8 @@ s_create_cache_file(request_rec *r, /* to cache */ rv = apr_file_open(&fout, tmpfile, - APR_WRITE| APR_CREATE | APR_BINARY | APR_SHARELOCK ,APR_OS_DEFAULT, - r->pool); + APR_FOPEN_WRITE| APR_FOPEN_CREATE | APR_FOPEN_BINARY | APR_SHARELOCK , + APR_OS_DEFAULT, r->pool); if (rv != APR_SUCCESS) { DestroyMagickWand(magick_wand); ERR(r,"file open error.[%s]", tmpfile); @@ -1675,7 +1675,8 @@ s_send_cache_file(device_table *spec, query_string_param_t *query_string, reques } } rv = apr_file_open(&fout, tmpfile, - APR_READ | APR_BINARY, APR_OS_DEFAULT, r->pool); + APR_FOPEN_READ | APR_FOPEN_BINARY | APR_FOPEN_BUFFERED | APR_FOPEN_SHARELOCK | APR_FOPEN_SENDFILE_ENABLED, + APR_OS_DEFAULT, r->pool); if (rv != APR_SUCCESS) { DBG(r, "cache file open failed[%s]", tmpfile); return HTTP_NOT_FOUND; @@ -1731,7 +1732,8 @@ s_send_cache_file(device_table *spec, query_string_param_t *query_string, reques DBG(r, "Content-Length:[%d]", (int)st.size); rv = apr_file_open(&fout, tmpfile, - APR_READ | APR_BINARY, APR_OS_DEFAULT, r->pool); + APR_FOPEN_READ | APR_FOPEN_BINARY | APR_FOPEN_BUFFERED | APR_FOPEN_SHARELOCK | APR_FOPEN_SENDFILE_ENABLED, + APR_OS_DEFAULT, r->pool); if (rv != APR_SUCCESS) { DBG(r,"tmpfile open failed[%s]", tmpfile); @@ -1770,7 +1772,8 @@ s_send_original_file(request_rec *r, const char *originalfile) } rv = apr_file_open(&fout, originalfile, - APR_READ | APR_BINARY, APR_OS_DEFAULT, r->pool); + APR_FOPEN_READ | APR_FOPEN_BINARY | APR_FOPEN_BUFFERED | APR_FOPEN_SHARELOCK | APR_FOPEN_SENDFILE_ENABLED, + APR_OS_DEFAULT, r->pool); if (rv != APR_SUCCESS) { DBG(r, "originalfile open failed[%s]", originalfile); return HTTP_NOT_FOUND; diff --git a/src/chxj_load_device_data.c b/src/chxj_load_device_data.c index 07de3e78..48f15ef8 100644 --- a/src/chxj_load_device_data.c +++ b/src/chxj_load_device_data.c @@ -516,7 +516,8 @@ s_sort_table_compare(const void *a, const void *b) { device_table *aa = *(device_table **)a; device_table *bb = *(device_table **)b; - return strcasecmp(aa->device_id, bb->device_id); + /* not strcasecmp. for LOAD */ + return strcmp(aa->device_id, bb->device_id); } /* diff --git a/src/chxj_specified_device.c b/src/chxj_specified_device.c index 4a4436d6..e92ff593 100644 --- a/src/chxj_specified_device.c +++ b/src/chxj_specified_device.c @@ -150,7 +150,8 @@ s_compar(const void *a, const void *b) #if 0 {FILE *fp=fopen("/tmp/erer.log","a");fprintf(fp, "aa[%s] vs bb[%s]\n", aa->device_id, bb->device_id); fclose(fp);} #endif - return strcasecmp(aa->device_id, bb->device_id); + /* Not strcasecmp. for LOAD */ + return strcmp(aa->device_id, bb->device_id); } static device_table * s_get_device_data(request_rec *r, const char *device_id, device_table_list *dtl) diff --git a/src/mod_chxj.c b/src/mod_chxj.c index c241eb5f..4505b1c4 100644 --- a/src/mod_chxj.c +++ b/src/mod_chxj.c @@ -257,7 +257,7 @@ chxj_headers_fixup(request_rec *r) } - char *x_client_type = apr_table_get(r->headers_out, "X-Client-Type"); + char *x_client_type = (char *)apr_table_get(r->headers_out, "X-Client-Type"); apr_table_unset(r->headers_out, "X-Client-Type"); if (x_client_type) { apr_table_setn(r->headers_in, "X-Client-Type", x_client_type); diff --git a/support/centos/mod-chxj.spec b/support/centos/mod-chxj.spec index ff65b13d..3ebad634 100644 --- a/support/centos/mod-chxj.spec +++ b/support/centos/mod-chxj.spec @@ -1,4 +1,4 @@ -%define version 0.12.38rc8 +%define version 0.12.38rc9 Summary: CHTML to HDML,XHTML,JHTML convert module for Apache HTTPD. Name: mod_chxj -- 2.11.0