Author: titmuss
Date: Wed Feb 13 09:26:12 2008
New Revision: 1932
URL: http://svn.slimdevices.com?rev=1932&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1918): titmuss | 2008-02-12 16:56:03 +0000
Bug: 7074
Description:
Revert change for jive-by-length, this caused problems with firmware upgrades.
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/jive/net/SocketHttp.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Feb 13 09:26:12 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1917
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1918
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: trunk/jive/src/pkg/jive/share/jive/net/SocketHttp.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/jive/net/SocketHttp.lua?rev=1932&root=Jive&r1=1931&r2=1932&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/jive/net/SocketHttp.lua (original)
+++ trunk/jive/src/pkg/jive/share/jive/net/SocketHttp.lua Wed Feb 13 09:26:12
2008
@@ -511,9 +511,11 @@
if length <= 0 then
return nil, 'done'
end
-
+
+ local size = math.min(BLOCKSIZE, length)
+
local chunk, err
- chunk, err, partial = sock:receive(length,
partial)
+ chunk, err, partial = sock:receive(size,
partial)
if err then -- including timeout
return nil, err
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
