Hi,


SPDY patch #52 is missing a few conditionals that are required when the patch has been applied but nginx is built using --without-ssl_spdy_module (on RHEL6 I need to build one version of nginx against an openssl that has it (ours) and another without (vendor's)).

Thanks.


--- src/http/ngx_http_request.c.old 2012-08-24 12:21:14.377350628 +0300
+++ src/http/ngx_http_request.c 2012-08-24 12:21:17.774312838 +0300
@@ -1981,10 +1981,12 @@
ngx_http_request_t *pr;
ngx_http_core_loc_conf_t *clcf;

+#if (NGX_HTTP_SPDY)
if (r->spdy_stream) {
ngx_http_spdy_finalize_request(r, rc);
return;
}
+#endif

c = r->connection;

--- src/http/ngx_http_request_body.c.old 2012-08-24 12:27:26.553322219 +0300
+++ src/http/ngx_http_request_body.c 2012-08-24 12:28:58.491538266 +0300
@@ -471,10 +471,12 @@
return NGX_OK;
}

+#if (NGX_HTTP_SPDY)
if (r->spdy_stream) {
r->discard_body = 1;
return NGX_OK;
}
+#endif

if (ngx_http_test_expect(r) != NGX_OK) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
--- auto/modules.old 2012-08-24 12:33:19.266063093 +0300
+++ auto/modules 2012-08-24 12:35:23.397878682 +0300
@@ -117,9 +117,13 @@

HTTP_FILTER_MODULES="$HTTP_WRITE_FILTER_MODULE \
$HTTP_HEADER_FILTER_MODULE \
- $HTTP_CHUNKED_FILTER_MODULE \
- $HTTP_SPDY_FILTER_MODULE \
- $HTTP_RANGE_HEADER_FILTER_MODULE"
+ $HTTP_CHUNKED_FILTER_MODULE"
+
+if [ $HTTP_SPDY = YES ]; then
+ HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_SPDY_FILTER_MODULE"
+fi
+
+HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_RANGE_HEADER_FILTER_MODULE"

if [ $HTTP_GZIP = YES ]; then
have=NGX_HTTP_GZIP . auto/have




Kaj_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel