OSDN Git Service

Merge branch 'branch_0.12.0' into sandbox
authorkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Fri, 26 Sep 2008 17:45:46 +0000 (17:45 +0000)
committerkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Fri, 26 Sep 2008 17:45:46 +0000 (17:45 +0000)
commitd0d3743affacb7c329f00b603f063b6824c6abd0
tree38f14061617058776a14bb72652001529bb2a58a
parent7d7f5fcb9bc998663cfd7c49a0a3cd65cd4ba173
  Merge branch 'branch_0.12.0' into sandbox

Conflicts:

src/chxj_chtml10.c
src/chxj_chtml20.c
src/chxj_chtml30.c
src/chxj_chtml40.c
src/chxj_chtml50.c
src/chxj_jhtml.c
src/chxj_jxhtml.c
src/chxj_xhtml_mobile_1_0.c

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/sandbox@3232 1a406e8e-add9-4483-a2c8-d8cac5b7c224
64 files changed:
ChangeLog
configure
configure.ac
debian-sarge/changelog
debian/changelog
include/chxj_cookie.h
include/chxj_dbm.h
include/chxj_tag_util.h
include/config.h
include/mod_chxj.h
src/Makefile.am
src/Makefile.in
src/chxj_chtml10.c
src/chxj_chtml20.c
src/chxj_chtml30.c
src/chxj_chtml40.c
src/chxj_chtml50.c
src/chxj_cookie.c
src/chxj_dbm.c
src/chxj_ixhtml10.c
src/chxj_jhtml.c
src/chxj_jxhtml.c
src/chxj_serf.c
src/chxj_tag_util.c
src/chxj_xhtml_mobile_1_0.c
src/mod_chxj.c
src/serf/CHANGES
src/serf/Makefile [deleted file]
src/serf/Makefile.in
src/serf/buckets/aggregate_buckets.c
src/serf/buckets/buckets.c
src/serf/buckets/dechunk_buckets.c
src/serf/buckets/deflate_buckets.c
src/serf/buckets/headers_buckets.c
src/serf/buckets/request_buckets.c
src/serf/buckets/response_buckets.c
src/serf/buckets/simple_buckets.c
src/serf/buckets/socket_buckets.c
src/serf/buckets/ssl_buckets.c
src/serf/build/apr_common.m4
src/serf/build/find_apu.m4
src/serf/config.log [deleted file]
src/serf/config.nice [deleted file]
src/serf/config.status [deleted file]
src/serf/configure
src/serf/context.c
src/serf/serf.h
src/serf/serf.mak
src/serf/serf_bucket_types.h
src/serf/serfmake
src/serf/test/CuTest-README.txt [new file with mode: 0644]
src/serf/test/CuTest.c [new file with mode: 0644]
src/serf/test/CuTest.h [new file with mode: 0644]
src/serf/test/serf_get.c
src/serf/test/serf_request.c
src/serf/test/serf_response.c
src/serf/test/serf_spider.c
src/serf/test/serftestca.pem [new file with mode: 0644]
src/serf/test/test_all.c [new file with mode: 0644]
src/serf/test/test_buckets.c [new file with mode: 0644]
src/serf/test/test_context.c [new file with mode: 0644]
src/serf/test/test_serf.h [new file with mode: 0644]
src/serf/test/test_ssl.c [new file with mode: 0644]
src/serf/test/test_util.c [new file with mode: 0644]