Commits

luastoned committed 5807972

Fixed a crash with the LuaSocket connector helper script when LuaSocket returned a timeout

  • Participants
  • Parent commits 738a251

Comments (0)

Files changed (1)

File connectors/luasocket.lua

 		headers = headers
 	})
 	r = table.concat( t, "" )
-	t = {}
-	for k, v in pairs( h ) do
-		if ( k == "set-cookie" ) then
-			-- We remove expiration data here since it has commas in the given
-			-- timestamps, so it doesn't break us separating individual cookies
-			-- below
-			v = string.gsub( v, "(expires=.-; )", "" )
-			-- Grab set-cookie and append an additional separator for gmatch
-			-- convenience
-			v = v .. ", "
-			for cookie in string.gmatch( v, "(.-), " ) do
-				cookie = string.match( cookie, "(.-);" )
-				table.insert( t, cookie )
+	if ( h ) then
+		t = {}
+		for k, v in pairs( h ) do
+			if ( k == "set-cookie" ) then
+				-- We remove expiration data here since it has commas in the given
+				-- timestamps, so it doesn't break us separating individual cookies
+				-- below
+				v = string.gsub( v, "(expires=.-; )", "" )
+				-- Grab set-cookie and append an additional separator for gmatch
+				-- convenience
+				v = v .. ", "
+				for cookie in string.gmatch( v, "(.-), " ) do
+					cookie = string.match( cookie, "(.-);" )
+					table.insert( t, cookie )
+				end
 			end
 		end
+		cookie = table.concat( t, "; " )
+	else
+		cookie = nil
 	end
-	cookie = table.concat( t, "; " )
 	return r, c, cookie
 end
 
 		headers = headers,
 	}, postData )
 	r = table.concat( t, "" )
-	t = {}
-	for k, v in pairs( h ) do
-		if ( k == "set-cookie" ) then
-			-- We remove expiration data here since it has commas in the given
-			-- timestamps, so it doesn't break us separating individual cookies
-			-- below
-			v = string.gsub( v, "(expires=.-; )", "" )
-			-- Grab set-cookie and append an additional separator for gmatch
-			-- convenience
-			v = v .. ", "
-			for cookie in string.gmatch( v, "(.-), " ) do
-				cookie = string.match( cookie, "(.-);" )
-				table.insert( t, cookie )
+	if ( h ) then
+		t = {}
+		for k, v in pairs( h ) do
+			if ( k == "set-cookie" ) then
+				-- We remove expiration data here since it has commas in the given
+				-- timestamps, so it doesn't break us separating individual cookies
+				-- below
+				v = string.gsub( v, "(expires=.-; )", "" )
+				-- Grab set-cookie and append an additional separator for gmatch
+				-- convenience
+				v = v .. ", "
+				for cookie in string.gmatch( v, "(.-), " ) do
+					cookie = string.match( cookie, "(.-);" )
+					table.insert( t, cookie )
+				end
 			end
 		end
+		cookie = table.concat( t, "; " )
+	else
+		cookie = nil
 	end
-	cookie = table.concat( t, "; " )
 	return r, c, cookie
 end