刚才发现tengine-2.1.2.tar.gz文件的md5sum值变了。
原md5sum值为76af6a4969e7179c2ff4512d31d9e12d
新md5sum值为7f898a0dbb5162ff1eb19aeb9d53bec3
当前官网下载页面上的md5sum值是正确的。但是我比较肯定这个文件一定是替换过而没有更新版本号。
以下为两个文件的diff,变动当然不大,但是请确认发布的流程是不是有问题?
diff -uprN tengine-2.1.2/src/http/ngx_http_request.c tengine-2.1.2.new/src/http/ngx_http_request.c
--- tengine-2.1.2/src/http/ngx_http_request.c 2015-12-31 13:45:20.000000000 +0800
+++ tengine-2.1.2.new/src/http/ngx_http_request.c 2015-12-31 23:38:36.000000000 +0800
@@ -786,41 +786,51 @@ ngx_http_ssl_handshake_handler(ngx_conne
&& (defined TLSEXT_TYPE_application_layer_protocol_negotiation \
|| defined TLSEXT_TYPE_next_proto_neg))
{
- unsigned int len;
+ unsigned int len, rc;
const unsigned char *data;
ngx_http_connection_t *hc;
hc = c->data;
+ rc = 0;
+#if (NGX_HTTP_V2)
+ rc |= hc->addr_conf->http2;
+#endif
+#if (NGX_HTTP_SPDY)
+ rc |= hc->addr_conf->spdy;
+#endif
+
+ if (rc) {
+
#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
- SSL_get0_alpn_selected(c->ssl->connection, &data, &len);
+ SSL_get0_alpn_selected(c->ssl->connection, &data, &len);
#ifdef TLSEXT_TYPE_next_proto_neg
- if (len == 0) {
- SSL_get0_next_proto_negotiated(c->ssl->connection, &data, &len);
- }
+ if (len == 0) {
+ SSL_get0_next_proto_negotiated(c->ssl->connection, &data, &len);
+ }
#endif
#else /* TLSEXT_TYPE_next_proto_neg */
- SSL_get0_next_proto_negotiated(c->ssl->connection, &data, &len);
+ SSL_get0_next_proto_negotiated(c->ssl->connection, &data, &len);
#endif
#if (NGX_HTTP_SPDY)
- if (len == sizeof(NGX_SPDY_NPN_NEGOTIATED) - 1
- && ngx_strncmp(data, NGX_SPDY_NPN_NEGOTIATED, len) == 0)
- {
- ngx_http_spdy_init(c->read);
- return;
- }
+ if (len == sizeof(NGX_SPDY_NPN_NEGOTIATED) - 1
+ && ngx_strncmp(data, NGX_SPDY_NPN_NEGOTIATED, len) == 0)
+ {
+ ngx_http_spdy_init(c->read);
+ return;
+ }
#endif
#if (NGX_HTTP_V2)
- if (len == 2 && data[0] == 'h' && data[1] == '2') {
- ngx_http_v2_init(c->read);
- return;
- }
+ if (len == 2 && data[0] == 'h' && data[1] == '2') {
+ ngx_http_v2_init(c->read);
+ return;
+ }
#endif
-
+ }
}
#endif