Merge branch 'develop-6.7' of https://github.com/runrev/livecode into develop-6.7-gyp

livecodefraser · livecodefraser · commit 3ecdf27ef287 · 2015-06-04T17:44:58.000+01:00
Conflicts:
	ide
diff --git a/docs/notes/bugfix-15456.md b/docs/notes/bugfix-15456.md
@@ -0,0 +1 @@
+# libURL handles Content-Transfer-Encoding incorrectly
diff --git a/engine/src/execpt.cpp b/engine/src/execpt.cpp
@@ -1054,7 +1054,7 @@ Exec_stat MCExecPoint::eval(MCExecPoint &ep)
     Exec_stat stat = ES_ERROR;
     if (sp.parseexp(False, True, &exp) == PS_NORMAL && sp.next(type) == PS_EOF)
     {
-        stat = exp->eval(*this);
+        stat = exp->eval(ep);
         grabsvalue();
     }
     delete exp;
diff --git a/ide b/ide
@@ -1 +1 @@
-Subproject commit 46aaff2d9ce1277abff41f0af462a71484975649
+Subproject commit d76f3d91ed62dc0680833355fb23a6c368add768
diff --git a/ide-support/revliburl.livecodescript b/ide-support/revliburl.livecodescript
@@ -971,6 +971,10 @@ on ulParseHeaders x
    local tLocLine,tLenLine,tContentLine,tCodeLine,tConnectionLine,ptConnLine
    
    set the lastRhHeaders of me to laRhHeader[laUrl[x]] ##set property
+   // SN-2015-06-04: [[ Bug 15456 ]] Apply fix proposed by Dave Cragg
+   //  see http://runtime-revolution.278305.n4.nabble.com/OT-More-on-false-timeouts-and-headers-td4692465.html
+   filter lines of laRhHeader[laUrl[x]]  without  "*Content-Transfer-Encoding:*"
+   
    put lineOffset("Location:",laRhHeader[laUrl[x]]) into tLocLine
    put lineOffset("Content-Length:",laRhHeader[laUrl[x]]) into tLenLine
    put lineOffset("Content-Type:",laRhHeader[laUrl[x]]) into tContentLine

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# libURL handles Content-Transfer-Encoding incorrectly`
Original file line number	Diff line number	Diff line change
`@@ -1054,7 +1054,7 @@ Exec_stat MCExecPoint::eval(MCExecPoint &ep)`
`1054`	`1054`	`Exec_stat stat = ES_ERROR;`
`1055`	`1055`	`if (sp.parseexp(False, True, &exp) == PS_NORMAL && sp.next(type) == PS_EOF)`
`1056`	`1056`	`{`
`1057`		`- stat = exp->eval(*this);`
	`1057`	`+ stat = exp->eval(ep);`
`1058`	`1058`	`grabsvalue();`
`1059`	`1059`	`}`
`1060`	`1060`	`delete exp;`