walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Rename shrpx as nghttpx superficially

This commit is contained in:
Tatsuhiro Tsujikawa 2013-07-26 21:42:39 +09:00
parent 86174f537a
commit 5ccf647df9
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Makefile.am
View File

@ -37,7 +37,7 @@ AM_CXXFLAGS = -std=c++11
LDADD = $(top_builddir)/lib/libnghttp2.la LDADD = $(top_builddir)/lib/libnghttp2.la
bin_PROGRAMS += nghttp nghttpd shrpx bin_PROGRAMS += nghttp nghttpd nghttpx
HELPER_OBJECTS = util.cc timegm.c app_helper.cc HELPER_OBJECTS = util.cc timegm.c app_helper.cc
HELPER_HFILES = util.h timegm.h app_helper.h nghttp2_config.h HELPER_HFILES = util.h timegm.h app_helper.h nghttp2_config.h
@ -70,7 +70,7 @@ nghttpd_SOURCES = ${HELPER_OBJECTS} ${HELPER_HFILES} nghttpd.cc \
HttpServer.cc HttpServer.h HttpServer.cc HttpServer.h
if HAVE_LIBEVENT_OPENSSL if HAVE_LIBEVENT_OPENSSL
SHRPX_SRCS = \ NGHTTPX_SRCS = \
util.cc util.h timegm.c timegm.h base64.h \ util.cc util.h timegm.c timegm.h base64.h \
shrpx_config.cc shrpx_config.h \ shrpx_config.cc shrpx_config.h \
shrpx_error.h \ shrpx_error.h \
@ -95,10 +95,10 @@ SHRPX_SRCS = \
http-parser/http_parser.c http-parser/http_parser.h http-parser/http_parser.c http-parser/http_parser.h
if HAVE_SPDYLAY if HAVE_SPDYLAY
SHRPX_SRCS += shrpx_spdy_upstream.cc shrpx_spdy_upstream.h NGHTTPX_SRCS += shrpx_spdy_upstream.cc shrpx_spdy_upstream.h
endif # HAVE_SPDYLAY endif # HAVE_SPDYLAY
shrpx_SOURCES = ${SHRPX_SRCS} shrpx.cc shrpx.h nghttpx_SOURCES = ${NGHTTPX_SRCS} shrpx.cc shrpx.h
# if HAVE_CUNIT # if HAVE_CUNIT
# check_PROGRAMS += shrpx-unittest # check_PROGRAMS += shrpx-unittest

18
src/shrpx.cc
View File

@ -324,7 +324,7 @@ void fill_default_config()
mod_config()->daemon = false; mod_config()->daemon = false;
mod_config()->verify_client = false; mod_config()->verify_client = false;
mod_config()->server_name = "shrpx nghttp2/" NGHTTP2_VERSION; mod_config()->server_name = "nghttpx nghttp2/" NGHTTP2_VERSION;
set_config_str(&mod_config()->host, "0.0.0.0"); set_config_str(&mod_config()->host, "0.0.0.0");
mod_config()->port = 3000; mod_config()->port = 3000;
mod_config()->private_key_file = 0; mod_config()->private_key_file = 0;
@ -371,7 +371,7 @@ void fill_default_config()
mod_config()->add_x_forwarded_for = false; mod_config()->add_x_forwarded_for = false;
mod_config()->no_via = false; mod_config()->no_via = false;
mod_config()->accesslog = false; mod_config()->accesslog = false;
set_config_str(&mod_config()->conf_path, "/etc/shrpx/shrpx.conf"); set_config_str(&mod_config()->conf_path, "/etc/nghttpx/nghttpx.conf");
mod_config()->syslog = false; mod_config()->syslog = false;
mod_config()->syslog_facility = LOG_DAEMON; mod_config()->syslog_facility = LOG_DAEMON;
mod_config()->use_syslog = false; mod_config()->use_syslog = false;
@ -410,9 +410,9 @@ void print_version(std::ostream& out)
namespace { namespace {
void print_usage(std::ostream& out) void print_usage(std::ostream& out)
{ {
out << "Usage: shrpx [-Dh] [-s|--client|-p] [-b <HOST,PORT>]\n" out << "Usage: nghttpx [-Dh] [-s|--client|-p] [-b <HOST,PORT>]\n"
<< " [-f <HOST,PORT>] [-n <CORES>] [-c <NUM>] [-L <LEVEL>]\n" << " [-f <HOST,PORT>] [-n <CORES>] [-c <NUM>] [-L <LEVEL>]\n"
<< " [OPTIONS...] [<PRIVATE_KEY> <CERT>]\n" << " [OPTIONS...] [<PRIVATE_KEY> <CERT>]\n"
<< "\n" << "\n"
<< "A reverse proxy for SPDY/HTTPS.\n" << "A reverse proxy for SPDY/HTTPS.\n"
<< std::endl; << std::endl;
@ -490,7 +490,7 @@ void print_help(std::ostream& out)
<< " when the backend connection is SPDY. First,\n" << " when the backend connection is SPDY. First,\n"
<< " make a CONNECT request to the proxy and\n" << " make a CONNECT request to the proxy and\n"
<< " it connects to the backend on behalf of\n" << " it connects to the backend on behalf of\n"
<< " shrpx. This forms tunnel. After that, shrpx\n" << " nghttpx. This forms tunnel. After that, nghttpx\n"
<< " performs SSL/TLS handshake with the\n" << " performs SSL/TLS handshake with the\n"
<< " downstream through the tunnel. The timeouts\n" << " downstream through the tunnel. The timeouts\n"
<< " when connecting and making CONNECT request\n" << " when connecting and making CONNECT request\n"
@ -519,7 +519,7 @@ void print_help(std::ostream& out)
<< " be requested interactively.\n" << " be requested interactively.\n"
<< " --subcert=<KEYPATH>:<CERTPATH>\n" << " --subcert=<KEYPATH>:<CERTPATH>\n"
<< " Specify additional certificate and private\n" << " Specify additional certificate and private\n"
<< " key file. Shrpx will choose certificates\n" << " key file. nghttpx will choose certificates\n"
<< " based on the hostname indicated by client\n" << " based on the hostname indicated by client\n"
<< " using TLS SNI extension. This option can be\n" << " using TLS SNI extension. This option can be\n"
<< " used multiple times.\n" << " used multiple times.\n"
@ -561,7 +561,7 @@ void print_help(std::ostream& out)
<< " to connect to the outside SPDY proxy.\n" << " to connect to the outside SPDY proxy.\n"
<< " --client Instead of accepting SPDY/HTTPS connection,\n" << " --client Instead of accepting SPDY/HTTPS connection,\n"
<< " accept HTTP connection and communicate with\n" << " accept HTTP connection and communicate with\n"
<< " backend server in SPDY. To use shrpx as\n" << " backend server in SPDY. To use nghttpx as\n"
<< " a forward proxy, use -p option instead.\n" << " a forward proxy, use -p option instead.\n"
<< " -p, --client-proxy Like --client option, but it also requires\n" << " -p, --client-proxy Like --client option, but it also requires\n"
<< " the request path from frontend must be\n" << " the request path from frontend must be\n"
@ -953,7 +953,7 @@ int main(int argc, char **argv)
} }
if(get_config()->syslog) { if(get_config()->syslog) {
openlog("shrpx", LOG_NDELAY | LOG_NOWAIT | LOG_PID, openlog("nghttpx", LOG_NDELAY | LOG_NOWAIT | LOG_PID,
get_config()->syslog_facility); get_config()->syslog_facility);
mod_config()->use_syslog = true; mod_config()->use_syslog = true;
} }

2
src/shrpx_http.cc
View File

@ -106,7 +106,7 @@ std::string create_via_header_value(int major, int minor)
hdrs += static_cast<char>(major+'0'); hdrs += static_cast<char>(major+'0');
hdrs += "."; hdrs += ".";
hdrs += static_cast<char>(minor+'0'); hdrs += static_cast<char>(minor+'0');
hdrs += " shrpx"; hdrs += " nghttpx";
return hdrs; return hdrs;
} }