From 23e982f14afee927924bed481b28e281543a3120 Mon Sep 17 00:00:00 2001 From: Atsushi Konno Date: Wed, 2 Mar 2011 01:45:31 +0900 Subject: [PATCH] * for rpm --- src/chxj_img_conv_format.c | 7 +++++-- src/mod_chxj.c | 5 ++--- support/centos/mod-chxj.spec | 16 ++++++++-------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/chxj_img_conv_format.c b/src/chxj_img_conv_format.c index 7cf10478..ff4ed7ad 100644 --- a/src/chxj_img_conv_format.c +++ b/src/chxj_img_conv_format.c @@ -523,7 +523,7 @@ s_create_cache_file(request_rec *r, readdata = apr_palloc(r->pool, st->size); rv = apr_file_read_full(fin, (void*)readdata, st->size, &readbyte); if (rv != APR_SUCCESS || readbyte != st->size) { - DBG(r,"REQ[%X] file read failed.[%s]", TO_ADDR(r), r->filename); + ERR(r,"REQ[%X] file read failed.[%s]", TO_ADDR(r), r->filename); apr_file_close(fin); return HTTP_NOT_FOUND; @@ -820,6 +820,7 @@ s_create_cache_file(request_rec *r, rv = apr_file_write(fout, (void*)writedata, &writebyte); if (rv != APR_SUCCESS) { + ERR(r,"REQ[%X] file write error.[%s]", TO_ADDR(r), tmpfile); DestroyMagickWand(magick_wand); apr_file_close(fout); if (sv_writedata) free(sv_writedata); @@ -836,6 +837,7 @@ s_create_cache_file(request_rec *r, rv = apr_file_putc((crc >> 8) & 0xff, fout); if (rv != APR_SUCCESS) { + ERR(r,"REQ[%X] file write error.[%s]", TO_ADDR(r), tmpfile); DestroyMagickWand(magick_wand); if (sv_writedata) free(sv_writedata); return HTTP_INTERNAL_SERVER_ERROR; @@ -843,6 +845,7 @@ s_create_cache_file(request_rec *r, rv = apr_file_putc( crc & 0xff, fout); if (rv != APR_SUCCESS) { + ERR(r,"REQ[%X] file write error.[%s]", TO_ADDR(r), tmpfile); DestroyMagickWand(magick_wand); if (sv_writedata) free(sv_writedata); return HTTP_INTERNAL_SERVER_ERROR; @@ -854,7 +857,7 @@ s_create_cache_file(request_rec *r, rv = apr_file_close(fout); if (rv != APR_SUCCESS) { - DBG(r,"file write error.[%s]", tmpfile); + ERR(r,"REQ[%X] file write error.[%s]", TO_ADDR(r), tmpfile); return HTTP_INTERNAL_SERVER_ERROR; } diff --git a/src/mod_chxj.c b/src/mod_chxj.c index 4505b1c4..a8bc0bce 100644 --- a/src/mod_chxj.c +++ b/src/mod_chxj.c @@ -1285,7 +1285,7 @@ chxj_output_filter(ap_filter_t *f, apr_bucket_brigade *bb) if (ctx->len) { char *tmp; - DBG(r, "REQ[%X] ctx->len[%d]", (unsigned int)(apr_size_t)r, ctx->len); + DBG(r, "REQ[%X] ctx->len[%ld]", (unsigned int)(apr_size_t)r, ctx->len); tmp = apr_palloc(pool, ctx->len + 1); memset(tmp, 0, ctx->len + 1); @@ -1429,7 +1429,6 @@ chxj_input_handler(request_rec *r) char *response; char *user_agent; apr_pool_t *pool; - apr_size_t ii; int response_code = 0; DBG(r, "start of chxj_input_handler()"); @@ -1488,7 +1487,7 @@ chxj_input_handler(request_rec *r) apr_size_t res_len; apr_table_setn(r->headers_in, CHXJ_HEADER_ORIG_CLIENT_IP, r->connection->remote_ip); - char *x_client_type = apr_table_get(r->headers_in, "X-Client-Type"); + char *x_client_type = (char *)apr_table_get(r->headers_in, "X-Client-Type"); if (x_client_type) { apr_table_setn(r->headers_in, CHXJ_HEADER_ORIG_CLIENT_TYPE, x_client_type); /* for mod_cidr_lookup */ } diff --git a/support/centos/mod-chxj.spec b/support/centos/mod-chxj.spec index 5bfca40d..15587594 100644 --- a/support/centos/mod-chxj.spec +++ b/support/centos/mod-chxj.spec @@ -9,8 +9,8 @@ Group: System Environment/Daemons Vendor: Atsushi Konno URL: http://sourceforge.jp/projects/modchxj/ Source: http://sourceforge.jp/projects/modchxj/downloads/33637/mod-chxj_%{version}.src.tar.gz -Source1: http://download.tangent.org/libmemcached-0.23.tar.gz -Packager: Atsushi Konno +Source1: http://launchpad.net/libmemcached/1.0/0.47/+download/libmemcached-0.47.tar.gz +Packager: Atsushi Konno Requires: ImageMagick >= 6.2.8.0, httpd >= 2.2.3, apr >= 1.2.7, apr-util >= 1.2.7, mysql >= 5.0.22, openssl >= 0.9.8 BuildPreReq: mysql-devel httpd-devel ImageMagick-devel gcc-c++ libtool openssl-devel @@ -23,13 +23,13 @@ function. %prep cd $RPM_BUILD_DIR -rm -rf libmemcached-0.23 -/bin/gzip -dc $RPM_SOURCE_DIR/libmemcached-0.23.tar.gz | tar -xf - +rm -rf libmemcached-0.47 +/bin/gzip -dc $RPM_SOURCE_DIR/libmemcached-0.47.tar.gz | tar -xf - STATUS=$? if [ $STATUS -ne 0 ]; then exit $STATUS fi -cd libmemcached-0.23 +cd libmemcached-0.47 ./configure --with-pic make %setup -q -n mod-chxj_%{version} @@ -39,9 +39,9 @@ make --with-mysql-header=/usr/include/mysql \ --with-mysql-lib-dir=/usr/lib/mysql \ --enable-memcache-cookie \ - --with-memcached-header=../libmemcached-0.23 \ - --with-memcached-lib-dir=../../libmemcached-0.23/libmemcached/.libs \ - --enable-memcached-static + --with-memcached-header=%{_topdir}/libmemcached-0.47 \ + --with-memcached-lib-dir=%{_topdir}/libmemcached-0.47/libmemcached/ \ + --enable-memcached-static %{__make} %install -- 2.11.0