Merge pull request chobits#89 from chobits/for_pull_request

fixed bug that non CONNECT request triggers segfault without location

Author: chobits

ngx_http_proxy_connect_module.c

@@ -1364,6 +1364,10 @@ ngx_http_proxy_connect_handler(ngx_http_request_t *r)
 
  plcf = ngx_http_get_module_loc_conf(r, ngx_http_proxy_connect_module);
 
+ if (r->method != NGX_HTTP_CONNECT || !plcf->accept_connect) {
+ return NGX_DECLINED;
+ }
+
  allow = 0;
 
  if (plcf->allow_port_all) {
@@ -2077,10 +2081,10 @@ ngx_http_proxy_connect_post_read_handler(ngx_http_request_t *r)
  ngx_http_proxy_connect_ctx_t *ctx;
  ngx_http_proxy_connect_loc_conf_t *pclcf;
 
- pclcf = ngx_http_get_module_loc_conf(r, ngx_http_proxy_connect_module);
-
  if (r->method == NGX_HTTP_CONNECT) {
 
+ pclcf = ngx_http_get_module_loc_conf(r, ngx_http_proxy_connect_module);
+
  if (!pclcf->accept_connect) {
  ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
  "client sent connect method");

t/http_proxy_connect.t

@@ -236,6 +236,41 @@ if ($test_enable_rewrite_phase) {
 }
 $t->stop();
 
+###############################################################################
+
+$t->write_file_expand('nginx.conf', <<'EOF');
+
+%%TEST_GLOBALS%%
+
+daemon off;
+
+events {
+}
+
+http {
+ %%TEST_GLOBALS_HTTP%%
+
+ access_log off;
+
+ server {
+ listen 127.0.0.1:8080;
+ proxy_connect;
+ proxy_connect_allow all;
+ }
+}
+
+EOF
+
+
+$t->run();
+
+$t->write_file('test.html', 'test page');
+
+like(http_get('/test.html'), qr/test page/, '200 for default root directive without location {}');
+like(http_get('/404'), qr/ 404 Not Found/, '404 for default root directive without location {}');
+
+$t->stop();
+
 
 # --- stop DNS server ---