From 5ccf647df9ea0295569ba6514e1093f6c3fd71ab Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Fri, 26 Jul 2013 21:42:39 +0900 Subject: [PATCH] Rename shrpx as nghttpx superficially --- src/Makefile.am | 8 ++++---- src/shrpx.cc | 18 +++++++++--------- src/shrpx_http.cc | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 9aaaa1b6..0762e820 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -37,7 +37,7 @@ AM_CXXFLAGS = -std=c++11 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_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 if HAVE_LIBEVENT_OPENSSL -SHRPX_SRCS = \ +NGHTTPX_SRCS = \ util.cc util.h timegm.c timegm.h base64.h \ shrpx_config.cc shrpx_config.h \ shrpx_error.h \ @@ -95,10 +95,10 @@ SHRPX_SRCS = \ http-parser/http_parser.c http-parser/http_parser.h 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 -shrpx_SOURCES = ${SHRPX_SRCS} shrpx.cc shrpx.h +nghttpx_SOURCES = ${NGHTTPX_SRCS} shrpx.cc shrpx.h # if HAVE_CUNIT # check_PROGRAMS += shrpx-unittest diff --git a/src/shrpx.cc b/src/shrpx.cc index 7364d07d..cae6bd46 100644 --- a/src/shrpx.cc +++ b/src/shrpx.cc @@ -324,7 +324,7 @@ void fill_default_config() mod_config()->daemon = 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"); mod_config()->port = 3000; mod_config()->private_key_file = 0; @@ -371,7 +371,7 @@ void fill_default_config() mod_config()->add_x_forwarded_for = false; mod_config()->no_via = 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_facility = LOG_DAEMON; mod_config()->use_syslog = false; @@ -410,9 +410,9 @@ void print_version(std::ostream& out) namespace { void print_usage(std::ostream& out) { - out << "Usage: shrpx [-Dh] [-s|--client|-p] [-b ]\n" - << " [-f ] [-n ] [-c ] [-L ]\n" - << " [OPTIONS...] [ ]\n" + out << "Usage: nghttpx [-Dh] [-s|--client|-p] [-b ]\n" + << " [-f ] [-n ] [-c ] [-L ]\n" + << " [OPTIONS...] [ ]\n" << "\n" << "A reverse proxy for SPDY/HTTPS.\n" << std::endl; @@ -490,7 +490,7 @@ void print_help(std::ostream& out) << " when the backend connection is SPDY. First,\n" << " make a CONNECT request to the proxy and\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" << " downstream through the tunnel. The timeouts\n" << " when connecting and making CONNECT request\n" @@ -519,7 +519,7 @@ void print_help(std::ostream& out) << " be requested interactively.\n" << " --subcert=:\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" << " using TLS SNI extension. This option can be\n" << " used multiple times.\n" @@ -561,7 +561,7 @@ void print_help(std::ostream& out) << " to connect to the outside SPDY proxy.\n" << " --client Instead of accepting SPDY/HTTPS connection,\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" << " -p, --client-proxy Like --client option, but it also requires\n" << " the request path from frontend must be\n" @@ -953,7 +953,7 @@ int main(int argc, char **argv) } if(get_config()->syslog) { - openlog("shrpx", LOG_NDELAY | LOG_NOWAIT | LOG_PID, + openlog("nghttpx", LOG_NDELAY | LOG_NOWAIT | LOG_PID, get_config()->syslog_facility); mod_config()->use_syslog = true; } diff --git a/src/shrpx_http.cc b/src/shrpx_http.cc index 26585fca..8ac787a0 100644 --- a/src/shrpx_http.cc +++ b/src/shrpx_http.cc @@ -106,7 +106,7 @@ std::string create_via_header_value(int major, int minor) hdrs += static_cast(major+'0'); hdrs += "."; hdrs += static_cast(minor+'0'); - hdrs += " shrpx"; + hdrs += " nghttpx"; return hdrs; }