Merge the rest of rapid7#1765

This merge and commit f2838ee is for both. I was a little quick on the
draw for the last merge, didn't catch the latest commit.

Author: Tod Beardsley

spec/lib/rex/proto/http/client_request_spec.rb

@@ -4,7 +4,7 @@
 
 
 shared_context "with no evasions" do
-  before(:all) do
+  before(:each) do
     client_request.opts['uri_dir_self_reference'] = false
     client_request.opts['uri_fake_params_start'] = false
     client_request.opts['uri_full_url'] = false
@@ -17,7 +17,7 @@
 
 
 shared_context "with 'uri_dir_self_reference'" do
-  before(:all) do
+  before(:each) do
     client_request.opts['uri_dir_self_reference'] = true
   end
 
@@ -29,7 +29,7 @@
 
 
 shared_context "with 'uri_dir_fake_relative'" do
-  before(:all) do
+  before(:each) do
     client_request.opts['uri_dir_fake_relative'] = true
   end
 
@@ -43,7 +43,7 @@
 
 shared_context "with 'uri_full_url'" do
 
-  before(:all) do
+  before(:each) do
     client_request.opts['uri_full_url'] = true
   end