Land #2899, don't stop at the first \f

This commit is contained in:
Tod Beardsley 2014-01-21 14:55:26 -06:00
commit 7660e2d3b7
No known key found for this signature in database
GPG Key ID: 1EFFB682ADB9F193
2 changed files with 3 additions and 3 deletions

View File

@ -8,8 +8,8 @@ module Rex::Proto::PJL
DEFAULT_PORT = 9100
DEFAULT_TIMEOUT = 5
COUNT_MAX = 2147483647
SIZE_MAX = 2147483647
COUNT_MAX = 2_147_483_647
SIZE_MAX = 2_147_483_647
UEL = "\e%-12345X" # Universal Exit Language
PREFIX = "@PJL"

View File

@ -151,7 +151,7 @@ class Client
@sock.put(%Q{#{FSUPLOAD} NAME = "#{pathname}" OFFSET=0 SIZE=#{size}\n})
if @sock.get(DEFAULT_TIMEOUT) =~ /SIZE=\d+\r?\n(.*?)\f/m
if @sock.get(DEFAULT_TIMEOUT) =~ /SIZE=\d+\r?\n(.*)\f/m
file = $1
end