ChangeLog

2011-11-29  Hans Muller  <hmuller@adobe.com>

        XHR 'progress' event code assumes wrongly that expectedLength >= 0

        https://bugs.webkit.org/show_bug.cgi?id=36156

        Reviewed by NOBODY (OOPS!).

        Avoid passing a negative value as the dispatchProgressEvent's total parameter and always use 0 when lengthComputable is false.

        Test: http/tests/xmlhttprequest/chunked-progress-event-expectedLength.html

        * xml/XMLHttpRequest.cpp:

        (WebCore::XMLHttpRequest::didReceiveData):

2011-11-29  Oliver Hunt  <oliver@apple.com>

        Revert that last change, apparently it destroys everything in the world.

Source/WebCore/xml/XMLHttpRequest.cpp

@@void XMLHttpRequest::didReceiveData(const char* data, int len)

        m_receivedLength += len;

        if (m_async) {

1083 bool lengthComputable = expectedLength && m_receivedLength <= expectedLength;

1084 m_progressEventThrottle.dispatchProgressEvent(lengthComputable, m_receivedLength, expectedLength);

            bool lengthComputable = expectedLength > 0 && m_receivedLength <= expectedLength;

            unsigned long long total = lengthComputable ? expectedLength : 0;

            m_progressEventThrottle.dispatchProgressEvent(lengthComputable, m_receivedLength, total);

10851086 }

1086

1087

        if (m_state != LOADING)

            changeState(LOADING);

        else

LayoutTests/ChangeLog

2011-11-29  Hans Muller  <hmuller@adobe.com>

        XHR 'progress' event code assumes wrongly that expectedLength >= 0

        https://bugs.webkit.org/show_bug.cgi?id=36156

        Reviewed by NOBODY (OOPS!).

        Verify that XMLHttpRequest ProgressEvent's total is zero when the expectedLength of the

        (chunked transfer mode) response can't be computed.

        * http/tests/xmlhttprequest/chunked-progress-event-expectedLength-expected.txt: Added.

        * http/tests/xmlhttprequest/chunked-progress-event-expectedLength.html: Added.

        * http/tests/xmlhttprequest/resources/chunked-transfer.php: Added.

2011-11-29  Xiaomei Ji  <xji@chromium.org>

        Rebase after r100819.

LayoutTests/http/tests/xmlhttprequest/chunked-progress-event-expectedLength-expected.txt

CONSOLE MESSAGE: line 26: 4, 0, false

Test case for bug 36156: XHR 'progress' event code assumes wrongly that expectedLength >= 0

Verify that the progress event total property is 0 when the expected overall length can't be computed.

PASS should appear below:

PASS

LayoutTests/http/tests/xmlhttprequest/chunked-progress-event-expectedLength.html

<html>

<head>

<title>Test case for bug 36156</title>

</head>

<body>

<p> Test case for <a href="https://bugs.webkit.org/show_bug.cgi?id=36156"> bug 36156</a>: XHR 'progress' event code assumes wrongly that expectedLength >= 0</p>

<p> Verify that the progress event total property is 0 when the expected overall length can't be computed.<p>

<p>PASS should appear below:</p>

<p id=console></p>

<script type="text/javascript">

if (window.layoutTestController) {

    layoutTestController.dumpAsText();

    layoutTestController.waitUntilDone();

}

function log(message)

{

    document.getElementById('console').appendChild(document.createTextNode(message + '\n'));

}

function test()

{

    var xhr = new XMLHttpRequest();

    xhr.open("GET", "resources/chunked-transfer.php", true);

    xhr.onprogress = function(e) {

        console.log(e.loaded + ", " + e.total + ", " + e.lengthComputable);

	if (e.loaded == 4 && e.total == 0 && !e.lengthComputable)

	{

	    log("PASS");

	    if (window.layoutTestController)

		layoutTestController.notifyDone();

	}

    }

    xhr.send();

}

test();

</script>

</body>

LayoutTests/http/tests/xmlhttprequest/resources/chunked-transfer.php

<?php 

header("Transfer-encoding: chunked");

flush();

sleep(0.5);

printf("4\r\n<a/>\r\n");

flush();

sleep(0.5);

printf("0\r\n\r\n"); 

?>