1 files changed, 6 insertions, 1 deletions
diff --git a/lib/soap/parser.rb b/lib/soap/parser.rb
index 1395be55ec..457d681d30 100644
--- a/lib/soap/parser.rb
+++ b/lib/soap/parser.rb
@@ -65,6 +65,7 @@ public
   attr_accessor :allow_unqualified_element
 
   def initialize(opt = {})
+    @opt = opt
     @parser = XSD::XMLParser.create_parser(self, opt)
     @parsestack = nil
     @lastnode = nil
@@ -201,6 +202,11 @@ private
     o = nil
     if ele.name == EleEnvelope
       o = SOAPEnvelope.new
+      if ext = @opt[:external_content]
+	ext.each do |k, v|
+	  o.external_content[k] = v
+	end
+      end
     elsif ele.name == EleHeader
       unless parent.node.is_a?(SOAPEnvelope)
 	raise FormatDecodeError.new("Header should be a child of Envelope.")
@@ -220,7 +226,6 @@ private
       o = SOAPFault.new
       parent.node.fault = o
     end
-    o.parent = parent if o
     o
   end