From: Kohei TANUMA <tanuma@users.sourceforge.jp>
Date: Mon, 10 Aug 2009 16:31:01 +0000 (+0900)
Subject: Merge branch 'packet_edit' into autotools-fix(releng)
X-Git-Tag: v1.0.2-0~9
X-Git-Url: http://git.osdn.net/view?p=ultramonkey-l7%2Fsslproxy.git;a=commitdiff_plain;h=6a681aed36006908c8a65ccd3de2fc599af9b46b

Merge branch 'packet_edit' into autotools-fix(releng)
---

6a681aed36006908c8a65ccd3de2fc599af9b46b
diff --cc CHANGES
index 8e3242b,8e3242b..ffc1e03
--- a/CHANGES
+++ b/CHANGES
@@@ -1,3 -1,3 +1,8 @@@
++[Aug. 24, 2009] 1.0.2-0 Kohei TANUMA
++  - New feature: Allows to modify HTTP header messages.
++                 See example of http_request_header, http_response_header
++                 settings in conf/sslproxy.target.cf.
++
  [Mar. 25, 2009] 1.0.1-1 Shinya TAKEBAYASHI
    - Fixed initialization routine
  
diff --cc README
index 38cde92,38cde92..4a4e3c9
--- a/README
+++ b/README
@@@ -9,7 -9,7 +9,7 @@@ System requirement
  ===================
  
             OS : Linux 2.6.9(or later)on x86 and x86_64 architecture
--                We recommend to use Redhat Enterprise Linux.
++                We recommend to use Red Hat Enterprise Linux.
  
            CPU : Intel x86 and x86_64 or compatible architecture processors
  
diff --cc conf/Makefile.am
index 1266dbd,e7830cb..ffcbe6c
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@@ -1,9 -1,7 +1,8 @@@
 -AUTOMAKE_OPTIONS = foreign
 +SUBDIRS = logrotate.d
  
 -install:
 -	$(INSTALL) -b -m 644 -D ./sslproxy.logger_init.cf /etc/l7vs/sslproxy/sslproxy.logger_init.cf
 -	$(INSTALL) -b -m 644 -D ./sslproxy.target.cf /etc/l7vs/sslproxy/sslproxy.target.cf
 -	$(INSTALL) -b -m 644 -D ./sslproxyadm.cf /etc/l7vs/sslproxy/sslproxyadm.cf
 -	$(INSTALL) -b -m 644 -D ./sslproxyadm.logrotate /etc/logrotate.d/sslproxyadm
 +sysconf_sslproxydir = $(sysconfdir)/l7vs/sslproxy
 +
 +dist_sysconf_sslproxy_DATA = \
 +	sslproxy.logger_init.cf \
- 	sslproxy.target_1.cf \
- 	sslproxy.target_2.cf \
++	sslproxy.target.cf \
 +	sslproxyadm.cf
diff --cc src/Makefile.am
index 99f8151,6c3db25..c200632
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -8,20 -9,36 +8,29 @@@ sslproxy_CPPFLAGS	= -O2 -g -I$(top_srcd
  		  -DVERSION=\"$(VERSION)\"
  
  sslproxy_SOURCES	=	\
 -			../logger/logger_wrapper.h \
 -			../parameter/parameter_wrapper.h \
 -			../include/sslproxy.h \
 -			../include/sslproxyserver.h \
 -			../include/sslproxysession.h \
 -			../include/packet_editor.h \
 -			../include/http_message.h \
 -			../include/http_request.h \
 -			../include/http_response.h \
 + 			$(top_srcdir)/logger/logger_wrapper.h \
 + 			$(top_srcdir)/parameter/parameter_wrapper.h \
 + 			$(top_srcdir)/include/sslproxy.h \
 + 			$(top_srcdir)/include/sslproxyserver.h \
 + 			$(top_srcdir)/include/sslproxysession.h \
++			$(top_srcdir)/include/packet_editor.h \
++			$(top_srcdir)/include/http_message.h \
++			$(top_srcdir)/include/http_request.h \
++			$(top_srcdir)/include/http_response.h \
  			sslproxy.cpp \
  			sslproxymain.cpp \
  			sslproxyserver.cpp \
- 			sslproxysession.cpp
+ 			sslproxysession.cpp \
+ 			packet_editor.cpp \
+ 			http_message.cpp \
+ 			http_request.cpp \
+ 			http_response.cpp
  
 -sslproxy_LDADD	=	../logger/libsslproxy_logger.a \
 -			../parameter/libsslproxy_parameter.a \
 +sslproxy_LDADD	=	$(top_builddir)/logger/libsslproxy_logger.a \
 +			$(top_builddir)/parameter/libsslproxy_parameter.a \
  			-llog4cxx \
  			-lrt \
  			-lssl \
+ 			-lboost_regex-gcc41-mt \
  			-lboost_system-gcc41-mt \
  			-lboost_thread-gcc41-mt
 -
 -install:
 -	$(INSTALL) -m 755 -D \
 -		./sslproxy \
 -		./sslproxyadm \
 -		$(SSLPROXY_SBINDIR)
 -	mkdir -p /var/log/l7vs/sslproxy
diff --cc src/sslproxymain.cpp
index e561b87,71ce5d1..56ad3bd
--- a/src/sslproxymain.cpp
+++ b/src/sslproxymain.cpp
@@@ -1504,7 -1586,7 +1586,7 @@@ static void usage(void
  	/*------ DEBUG LOG END ------*/
  
  	std::cerr << "Usage   : " << "sslproxy <target_id> <config_filename>" << std::endl;
--	std::cerr << "Example : " << "sslproxy target_1 /etc/l7vs/sslproxy/sslproxy.target_1.cf" << std::endl;
++	std::cerr << "Example : " << "sslproxy target_1 /etc/l7vs/sslproxy/sslproxy.target.cf" << std::endl;
  
  	/*-------- DEBUG LOG --------*/
  	if (LOG_LV_DEBUG == logger_get_log_level(LOG_CAT_SSLPROXY_COMMON)) {