diff options
| -rw-r--r-- | src/nxt_php_sapi.c | 6 | ||||
| -rw-r--r-- | src/nxt_python_wsgi.c | 6 | ||||
| -rw-r--r-- | src/perl/nxt_perl_psgi.c | 6 | ||||
| -rw-r--r-- | src/ruby/nxt_ruby.c | 6 | ||||
| -rw-r--r-- | test/test_python_application.py | 1 |
5 files changed, 7 insertions, 18 deletions
diff --git a/src/nxt_php_sapi.c b/src/nxt_php_sapi.c index e36dd20a..80321a85 100644 --- a/src/nxt_php_sapi.c +++ b/src/nxt_php_sapi.c @@ -917,10 +917,8 @@ nxt_php_register_variables(zval *track_vars_array TSRMLS_DC) track_vars_array TSRMLS_CC); nxt_php_set_sptr(req, "REQUEST_URI", &r->target, r->target_length, track_vars_array TSRMLS_CC); - if (r->query.offset) { - nxt_php_set_sptr(req, "QUERY_STRING", &r->query, r->query_length, - track_vars_array TSRMLS_CC); - } + nxt_php_set_sptr(req, "QUERY_STRING", &r->query, r->query_length, + track_vars_array TSRMLS_CC); nxt_php_set_sptr(req, "REMOTE_ADDR", &r->remote, r->remote_length, track_vars_array TSRMLS_CC); diff --git a/src/nxt_python_wsgi.c b/src/nxt_python_wsgi.c index 80ffb0f7..6478f38c 100644 --- a/src/nxt_python_wsgi.c +++ b/src/nxt_python_wsgi.c @@ -720,11 +720,7 @@ nxt_python_get_environ(nxt_python_run_ctx_t *ctx) RC(nxt_python_add_sptr(ctx, "REQUEST_METHOD", &r->method, r->method_length)); RC(nxt_python_add_sptr(ctx, "REQUEST_URI", &r->target, r->target_length)); - - if (r->query.offset) { - RC(nxt_python_add_sptr(ctx, "QUERY_STRING", &r->query, - r->query_length)); - } + RC(nxt_python_add_sptr(ctx, "QUERY_STRING", &r->query, r->query_length)); RC(nxt_python_add_sptr(ctx, "PATH_INFO", &r->path, r->path_length)); RC(nxt_python_add_sptr(ctx, "REMOTE_ADDR", &r->remote, r->remote_length)); diff --git a/src/perl/nxt_perl_psgi.c b/src/perl/nxt_perl_psgi.c index efcff7e3..3e865d46 100644 --- a/src/perl/nxt_perl_psgi.c +++ b/src/perl/nxt_perl_psgi.c @@ -548,10 +548,8 @@ nxt_perl_psgi_env_create(PerlInterpreter *my_perl, RC(nxt_perl_psgi_add_value(my_perl, hash_env, NL("psgi.streaming"), &PL_sv_no)); - if (r->query.offset) { - RC(nxt_perl_psgi_add_sptr(my_perl, hash_env, NL("QUERY_STRING"), - &r->query, r->query_length)); - } + RC(nxt_perl_psgi_add_sptr(my_perl, hash_env, NL("QUERY_STRING"), + &r->query, r->query_length)); RC(nxt_perl_psgi_add_sptr(my_perl, hash_env, NL("SERVER_PROTOCOL"), &r->version, r->version_length)); RC(nxt_perl_psgi_add_sptr(my_perl, hash_env, NL("REMOTE_ADDR"), diff --git a/src/ruby/nxt_ruby.c b/src/ruby/nxt_ruby.c index 17831175..b2398abe 100644 --- a/src/ruby/nxt_ruby.c +++ b/src/ruby/nxt_ruby.c @@ -442,10 +442,8 @@ nxt_ruby_read_request(VALUE hash_env) nxt_ruby_add_sptr(hash_env, NL("REQUEST_URI"), &r->target, r->target_length); nxt_ruby_add_sptr(hash_env, NL("PATH_INFO"), &r->path, r->path_length); - if (r->query.offset) { - nxt_ruby_add_sptr(hash_env, NL("QUERY_STRING"), &r->query, - r->query_length); - } + nxt_ruby_add_sptr(hash_env, NL("QUERY_STRING"), &r->query, + r->query_length); nxt_ruby_add_sptr(hash_env, NL("SERVER_PROTOCOL"), &r->version, r->version_length); nxt_ruby_add_sptr(hash_env, NL("REMOTE_ADDR"), &r->remote, diff --git a/test/test_python_application.py b/test/test_python_application.py index da5d3ba2..a8631085 100644 --- a/test/test_python_application.py +++ b/test/test_python_application.py @@ -65,7 +65,6 @@ class TestUnitPythonApplication(unit.TestUnitApplicationPython): self.assertEqual(resp['headers']['Query-String'], '', 'query string empty') - @unittest.expectedFailure def test_python_application_query_string_absent(self): self.load('query_string') |