| Index: Source/core/xml/XMLHttpRequest.cpp
|
| diff --git a/Source/core/xml/XMLHttpRequest.cpp b/Source/core/xml/XMLHttpRequest.cpp
|
| index 783654be701caef3da7d4b20308723f324f8f8c2..0de050a9e2c370513c8e91a88069e0b6394994ab 100644
|
| --- a/Source/core/xml/XMLHttpRequest.cpp
|
| +++ b/Source/core/xml/XMLHttpRequest.cpp
|
| @@ -344,7 +344,16 @@ void XMLHttpRequest::setTimeout(unsigned long timeout, ExceptionState& exception
|
| exceptionState.throwDOMException(InvalidAccessError, "Timeouts cannot be set for synchronous requests made from a document.");
|
| return;
|
| }
|
| +
|
| m_timeoutMilliseconds = timeout;
|
| +
|
| + // From http://www.w3.org/TR/XMLHttpRequest/#the-timeout-attribute:
|
| + // Note: This implies that the timeout attribute can be set while fetching is in progress. If
|
| + // that occurs it will still be measured relative to the start of fetching.
|
| + //
|
| + // The timeout may be overridden after send.
|
| + if (m_loader)
|
| + m_loader->overrideTimeout(timeout);
|
| }
|
|
|
| void XMLHttpRequest::setResponseType(const String& responseType, ExceptionState& exceptionState)
|
|
|