fixup

src/Makefile.am

@@ -75,7 +75,7 @@ SHRPX_SRCS = \
 	shrpx_listen_handler.cc shrpx_listen_handler.h \
 	shrpx_client_handler.cc shrpx_client_handler.h \
 	shrpx_upstream.h \
-	shrpx_spdy_upstream.cc shrpx_spdy_upstream.h \
+	shrpx_http2_upstream.cc shrpx_http2_upstream.h \
 	shrpx_https_upstream.cc shrpx_https_upstream.h \
 	shrpx_downstream_queue.cc shrpx_downstream_queue.h \
 	shrpx_downstream.cc shrpx_downstream.h \

src/shrpx_client_handler.cc

@@ -28,7 +28,7 @@
 #include <cerrno>
 
 #include "shrpx_upstream.h"
-#include "shrpx_spdy_upstream.h"
+#include "shrpx_http2_upstream.h"
 #include "shrpx_https_upstream.h"
 #include "shrpx_config.h"
 #include "shrpx_http_downstream_connection.h"
@@ -140,7 +140,7 @@ ClientHandler::ClientHandler(bufferevent *bev, int fd, SSL *ssl,
       upstream_ = new HttpsUpstream(this);
     } else {
       // no-TLS SPDY
-      upstream_ = new SpdyUpstream(this);
+      upstream_ = new Http2Upstream(this);
     }
     set_bev_cb(upstream_readcb, upstream_writecb, upstream_eventcb);
   }
@@ -210,7 +210,7 @@ int ClientHandler::validate_next_proto()
       CLOG(INFO, this) << "The negotiated next protocol: " << proto;
     }
     if(proto == NGHTTP2_PROTO_VERSION_ID) {
-      upstream_ = new SpdyUpstream(this);
+      upstream_ = new Http2Upstream(this);
       return 0;
     }
   } else {

src/shrpx_spdy_upstream.h → src/shrpx_http2_upstream.h

@@ -36,10 +36,10 @@ namespace shrpx {
 
 class ClientHandler;
 
-class SpdyUpstream : public Upstream {
+class Http2Upstream : public Upstream {
 public:
-  SpdyUpstream(ClientHandler *handler);
-  virtual ~SpdyUpstream();
+  Http2Upstream(ClientHandler *handler);
+  virtual ~Http2Upstream();
   virtual int on_read();
   virtual int on_write();
   virtual int on_event();