From f67049b2d3ed9ef930431763a0a2c67f5623087f Mon Sep 17 00:00:00 2001
From: fyodor <fyodor@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Wed, 3 Sep 2008 06:22:13 +0000
Subject: [PATCH] o Fix a bug in the NSE http library which would cause some
 scripts to   give the error: SCRIPT ENGINE: C:\Program  
 Files\Nmap\nselib/http.lua:77: attempt to call field 'parse' (a nil   value)
 [Jah]

Also added Win2K dependencies section to nmap-install (I should have
done a separate checkin for that)
---
 CHANGELOG             | 5 +++++
 docs/nmap-install.xml | 5 +++++
 nselib/http.lua       | 4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ad0ce6cc2..cabde3278 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,10 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Fix a bug in the NSE http library which would cause some scripts to
+  give the error: SCRIPT ENGINE: C:\Program
+  Files\Nmap\nselib/http.lua:77: attempt to call field 'parse' (a nil
+  value) [Jah]
+
 o The NSE datafiles library now has generic file parsing routines, and
   the parsing of the standard nmap data files (e.g. nmap-services,
   nmap-protocols, etc.) now uses those generic routines.  NSE scripts
diff --git a/docs/nmap-install.xml b/docs/nmap-install.xml
index 63c210951..6299679a6 100644
--- a/docs/nmap-install.xml
+++ b/docs/nmap-install.xml
@@ -734,6 +734,11 @@ Nmap, all of which are available from the
 download page at <ulink url="http://nmap.org/download.html" />.</para>
 
 
+<sect2 id="inst-win2k"><title>Windows 2000 Dependencies</title>
+<indexterm><primary>Windows</primary><secondary>Windows 2000 Dependencies</secondary></indexterm>
+
+<para>Nmap supports Windows 2000, but a couple dependencies from Microsoft must be installed first.  Those are the <ulink url="http://microsoft.com/downloads/details.aspx?FamilyID=889482FC-5F56-4A38-B838-DE776FD4138C">Windows Installer 3.1 (v2)</ulink> and the <ulink url="http://microsoft.com/downloads/details.aspx?FamilyID=0692C27E-F63A-414C-B3EB-D2342FBB6C00">Security Update for Windows 2000 (KB835732)</ulink>.  After installing these, follow the general instructions in the following two sections to install Nmap.</para>
+</sect2>
 
 <sect2 id="inst-win-exe"><title>Windows Self-installer</title>
 <indexterm><primary>Windows</primary><secondary>self-installer</secondary></indexterm>
diff --git a/nselib/http.lua b/nselib/http.lua
index bf7d56ed4..1d3c64524 100644
--- a/nselib/http.lua
+++ b/nselib/http.lua
@@ -73,8 +73,8 @@ end
 -- @param url The url of the host.
 -- @param options Options passed to http.get.
 -- @see http.get
-get_url = function(url, options )
-  local parsed = url.parse( url )
+get_url = function( u, options )
+  local parsed = url.parse( u )
   local port = {}
 
   port.service = parsed.scheme