Merge lp:~rpadovani/oxide/http-status-code into lp:~oxide-developers/oxide/oxide.trunk

[Riccardo Padovani]

Implement HttpStatusCode in OxideQLoadEvent

My first patch for Oxide :-)

So, atm it doesn't work (and test fails) because it returns always Code 200. I submitted the code just to have some feedbacks.

I inserted in the Enum HttpStatusCode all codes listed here: https://tools.ietf.org/html/rfc2616#section-6.1.1

[Olivier Tilloy (osomon)]

You’re setting the HTTP status code on load events emitted from a LoadCommitted event. That’s not enough, the HTTP status code is also relevant for load events emitted from LoadRedirected, LoadFailed and LoadSucceeded events.

Also, I’m not sure it’s super useful to define an enum for the codes. I’m thinking an int property would be enough. But if we go for an enum, you might be able to get rid of HttpStatusCodeFromInt by doing a static cast from the int value to the enum.

[Chris Coulson (chrisccoulson)]

> You’re setting the HTTP status code on load events emitted from a
> LoadCommitted event. That’s not enough, the HTTP status code is also relevant
> for load events emitted from LoadRedirected, LoadFailed and LoadSucceeded
> events.
>
> Also, I’m not sure it’s super useful to define an enum for the codes. I’m
> thinking an int property would be enough. But if we go for an enum, you might
> be able to get rid of HttpStatusCodeFromInt by doing a static cast from the
> int value to the enum.

Yeah, I'd be tempted to just use an int for this too (and setting it to -1 for events which don't have a status code). Other API's seem to just use an int (eg, https://developer.gnome.org/libsoup/stable/SoupMessage.html#SoupMessage--status-code, although they use an unsigned int here).

Note that LoadFailed can be generated before a commit - this means the connection failed for the main resource and there will be no valid status code. (If it's generated after a commit, then it means that the main resource loaded but a subresource failed. In this case, the status code will be the one for the successful main resource load).

[Chris Coulson (chrisccoulson)]

To expose the status code for load succeeded events, you can use the same mechanism as used for committed events (NavigationEntry::GetHttpStatusCode). For redirect events, it's slightly different as the status code on NavigationEntry is only set when a load commits - in this case, you can use content::ResourceRedirectDetails::http_response_code (see |details| in WebView::DidGetRedirectForResourceRequest).

[Chris Coulson (chrisccoulson)]

Ok, I've added a few minor comments inline as well.

In addition to additional tests with a few different response codes, it would be worthwhile adding this property to the tests in tst_WebView_loading.qml where we test the sequence of LoadEvents (I guess it should always be "200" in these tests for events where the status code is valid).

And thanks for working on this :)

review: Needs Fixing

[Riccardo Padovani (rpadovani)]

Thanks for your feedbacks :-)

So, I dropped Enum and I implemented http_status_code also for Redirect and Success.

The code should be ok, but I didn't understand what I should add to oxide_qml_plugin.cc. I read the documentation, but I don't understand how qmlRegisterUncreatableType uri works, sorry.

I'm also a bit confused by tests: I thougth (let me know if I'm wrong) to write a test for every 'collection' of status code (2xx, 3xx, 4xx, 5xx) instead a test for each status code, so they verify also if on an url change the code status is updated.

But this approach has something wrong, because every LoadEvent.TypeSucceeded returns -1, and it's not a code fail, because I updated also tst_WebView_loading.qml and there LoadEvent.TypeSucceeded returns the right status code.

In exports.onBeforeSendHeaders = function(event){} (file qt/tests/qmltests/api/tst_LoadEvent_httpStatusCode.js) I wasn't able to use functions to manipulate strings, like substring, because they stop execution of the function. There is a way to don't have all these if, but simply extract the argument and pass it to the python script?

Or maybe there is a better way at all to create these tests?

Last thing: when the page returns 407 http_status_code becomes 406.
This maybe due the response, because 407 should also indicates the proxy that the requestor should use, so since the python script doesn't indicate anything, it fails on 406?

Thanks for your time!

[Olivier Tilloy (osomon)]

You will need to add the following line at the end of OxideQmlPlugin::registerTypes(…):

    qmlRegisterUncreatableType<OxideQLoadEvent, 2>(uri, 1, 8, "LoadEvent",
        "LoadEvent is delivered by WebView.loadEvent");

This means that revision 2 of OxideQLoadEvent is registered under oxide 1.8, and as a consequence the new property won’t be accessible when importing previous versions.
As a consequence you will need to update tst_LoadEvent_httpStatusCode.qml and tst_WebView_loading.qml to import oxide 1.8.

[Olivier Tilloy (osomon)]

As for the unit tests, no need for a javascript file that inserts a custom header for the server to parse. In the python handler function, request.path contains e.g. "/tst_LoadEvent_httpStatusCode.py?404", so you can just parse this to get the expected status code.

[Riccardo Padovani (rpadovani)]

Hi Olivier,
thanks for your feedback.

Sorry for the delay, it has been a busy week!

I followed your suggestions, so I think now it's ok, but it still has problems with test, because every LoadEvent.TypeSucceeded returns -1 in tst_LoadEvent_httpStatusCode.qml, and it's not a code fail, because I updated also tst_WebView_loading.qml and there LoadEvent.TypeSucceeded returns the right status code.

[Olivier Tilloy (osomon)]

Try the following patch, this should fix the issue you’re seeing with httpStatusCode not properly set:

=== modified file 'qt/core/browser/oxide_qt_web_view.cc'
--- qt/core/browser/oxide_qt_web_view.cc 2015-04-30 21:25:36 +0000
+++ qt/core/browser/oxide_qt_web_view.cc 2015-04-30 21:56:58 +0000
@@ -621,6 +621,7 @@
   OxideQLoadEvent event(
       QUrl(QString::fromStdString(validated_url.spec())),
       OxideQLoadEvent::TypeSucceeded,
+ false,
       http_status_code);
   client_->LoadEvent(&event);
 }

review: Needs Fixing

[Riccardo Padovani (rpadovani)]

You rock, thanks :-)

Could you please help me understandig what was wrong?

So, as far as I can say, I called the wrong constructor - instead of

OxideQLoadEvent::OxideQLoadEvent(const QUrl& url,
                                 Type type,
                                 bool is_error,
                                 int http_status_code)

I called

OxideQLoadEvent::OxideQLoadEvent(const QUrl& url,
                                 const QUrl& original_url,
                                 int http_status_code)

so, why the compiler didn't warning me about the conversion from Type type to const QUrl& original_url?

[Olivier Tilloy (osomon)]

In fact the right constructor was being called, but the status code was being converted to a boolean (is_error), and http_status_code was initialized with its default value, -1.

[Olivier Tilloy (osomon)]

There is now a minor conflict in qt/qmlplugin/oxide_qml_plugin.cc when merging this branch into trunk, would you mind addressing it? Both conflicting lines need to stay.

[lp:~rpadovani/oxide/http-status-code]

1040. By Riccardo Padovani on 2015-05-11

Merge from trunk and resolve conflict

[Riccardo Padovani (rpadovani)]

Fixed

[Olivier Tilloy (osomon)]

Thanks Riccardo for working on this! The logic looks good and seems to work well. I have a few comments, mostly on the unit tests:

 - In tst_LoadEvent_httpStatusCode.py, the body of the response (html) should be written regardless of the status code (it’s currently written only if http_status_code < 400. Actually, reading the spec more closely, for status codes 204 and 304 there musn’t be a message body, so those need to be special-cased. All others should be fine with a body.

 - In shared/browser/oxide_web_view.cc, the new line after OnLoadRedirected( needs to be indented by 4 whitespaces, for consistency with the rest of the codebase.

 - It should be possible to rewrite the tests in tst_LoadEvent_httpStatusCode.qml to be data-driven (see http://doc.qt.io/qt-5/qml-qttest-testcase.html#data-driven-tests): each row of data would contain a status code, together with a list of expected load events and their respective status codes.

 - Would it be possible to add tests for 3xx and 5xx status codes?

 - What exactly are the issues with the tests for status codes 205 and 407?

[Chris Coulson (chrisccoulson)]

Thanks for working on this - I've added one comment inline.

Also, I don't really understand the difference between -1 and 0. There is a comment saying that -1 is unknown, and that 0 is a list of cases where the status code isn't available - but aren't these just the same?

[lp:~rpadovani/oxide/http-status-code]

1041. By Riccardo Padovani on 2015-05-15

Improve tests for http status code

- Always write body of the response in tst_LoadEvent_httpStatusCode.py
- Tests now are data-driven
- Add tests for 3xx and 5xx status code

1042. By Riccardo Padovani on 2015-05-15

Add is_provisional_load to DispatchLoadFailed to be sure we have an http status code

[Riccardo Padovani (rpadovani)]

I think I addressed all your comments.

@Chris: it returns -1 as default - comment was wrong, now it's only the default value. At first implementation I added Enum for status codes, so when a status code wasn't in the enum it used -1.

I think it's importat the difference between 0 and -1: 0 is returned by Chromium for cases listed in the comment, -1 is returned by Oxide. If you don't want this difference, I change -1 with 0 as default.

@Olivier, now fails only test for 407.
This is the output:

1: 127.0.0.1 - - [15/May/2015 12:30:32] code 407, message Proxy Authentication Required
1: 127.0.0.1 - - [15/May/2015 12:30:32] "GET /tst_LoadEvent_httpStatusCode.py?407 HTTP/1.1" 407 -
1: FAIL! : qml-api-test::LoadEvent_httpStatusCode::test_HttpStatusCode4xx(407) Unexpected value of httpStatusCode
1: Actual (): 406
1: Expected (): 407
1: Loc: [/home/rpadovani/Ubuntu/touch/oxide/branches/firstTime/qt/tests/qmltests/api/tst_LoadEvent_httpStatusCode.qml(22)]

Maybe is because 407 is Proxy Authentication Required and for specs:
   The proxy MUST
   return a Proxy-Authenticate header field (section 14.33) containing a
   challenge applicable to the proxy for the requested resource.

but our http server doesn't return anything?

[Chris Coulson (chrisccoulson)]

> I think I addressed all your comments.
>
> @Chris: it returns -1 as default - comment was wrong, now it's only the
> default value. At first implementation I added Enum for status codes, so when
> a status code wasn't in the enum it used -1.
>
> I think it's importat the difference between 0 and -1: 0 is returned by
> Chromium for cases listed in the comment, -1 is returned by Oxide. If you
> don't want this difference, I change -1 with 0 as default.
>

I'm not convinced it's important to convey this distinction in the API - either there's a valid status code with this event, or there isn't. I think I'd prefer just sticking with -1 or 0 (I don't mind which).

> @Olivier, now fails only test for 407.
> This is the output:
>
> 1: 127.0.0.1 - - [15/May/2015 12:30:32] code 407, message Proxy Authentication
> Required
> 1: 127.0.0.1 - - [15/May/2015 12:30:32] "GET
> /tst_LoadEvent_httpStatusCode.py?407 HTTP/1.1" 407 -
> 1: FAIL! : qml-api-
> test::LoadEvent_httpStatusCode::test_HttpStatusCode4xx(407) Unexpected value
> of httpStatusCode
> 1: Actual (): 406
> 1: Expected (): 407
> 1: Loc: [/home/rpadovani/Ubuntu/touch/oxide/branches/firstTime/qt/tests/qml
> tests/api/tst_LoadEvent_httpStatusCode.qml(22)]
>
> Maybe is because 407 is Proxy Authentication Required and for specs:
> The proxy MUST
> return a Proxy-Authenticate header field (section 14.33) containing a
> challenge applicable to the proxy for the requested resource.
>
> but our http server doesn't return anything?

You can modify tst_LoadEvent_httpStatusCode.py to return whatever headers you like, but in this case, I don't think this would fix the test (it's missing some other bits in Oxide, notably bug 1422339 I believe). I'd just remove the test for this status code for now.

[lp:~rpadovani/oxide/http-status-code]

1043. By Riccardo Padovani on 2015-05-15

Return 0 as default for http status code

1044. By Riccardo Padovani on 2015-05-15

Remove test for http status code 407

[Riccardo Padovani (rpadovani)]

I removed test 407 and set 0 as default http status code, thanks for your feedback :-)

[Chris Coulson (chrisccoulson)]

Thanks! I think this is good to merge (although I'll wait to see if Olivier has any other comments)

review: Approve

[Olivier Tilloy (osomon)]

That looks good to me too. I think all the test_HttpStatusCode*xx functions could be factored out into only one test function (and the special-casing on whether to test for load committed, succeeded or stopped should be part of the data driving the test), but at this stage that’s just picking nits (and we can still refactor that later on).

review: Approve

=== modified file 'qt/core/api/oxideqloadevent.cc'
--- qt/core/api/oxideqloadevent.cc	2014-12-08 14:09:25 +0000
+++ qt/core/api/oxideqloadevent.cc	2015-05-15 12:21:58 +0000
@@ -26,6 +26,7 @@
       : type(OxideQLoadEvent::TypeStarted),
         error_domain(OxideQLoadEvent::ErrorDomainNone),
         error_code(0),
+        http_status_code(0),
         is_error(false) {}
 
   QUrl url;
@@ -33,13 +34,15 @@
   OxideQLoadEvent::ErrorDomain error_domain;
   QString error_string;
   int error_code;
+  int http_status_code;
   QUrl original_url;
   bool is_error;
 };
 
 OxideQLoadEvent::OxideQLoadEvent(const QUrl& url,
                                  Type type,
-                                 bool is_error)
+                                 bool is_error,
+                                 int http_status_code)
     : d_ptr(new OxideQLoadEventPrivate()) {
   Q_D(OxideQLoadEvent);
 
@@ -50,12 +53,14 @@
   d->url = url;
   d->type = type;
   d->is_error = is_error;
+  d->http_status_code = http_status_code;
 }
 
 OxideQLoadEvent::OxideQLoadEvent(const QUrl& url,
                                  ErrorDomain error_domain,
                                  const QString& error_string,
-                                 int error_code)
+                                 int error_code,
+                                 int http_status_code)
     : d_ptr(new OxideQLoadEventPrivate()) {
   Q_D(OxideQLoadEvent);
 
@@ -64,16 +69,19 @@
   d->error_domain = error_domain;
   d->error_string = error_string;
   d->error_code = error_code;
+  d->http_status_code = http_status_code;
 }
 
 OxideQLoadEvent::OxideQLoadEvent(const QUrl& url,
-                                 const QUrl& original_url)
+                                 const QUrl& original_url,
+                                 int http_status_code)
     : d_ptr(new OxideQLoadEventPrivate()) {
   Q_D(OxideQLoadEvent);
 
   d->url = url;
   d->type = OxideQLoadEvent::TypeRedirected;
   d->original_url = original_url;
+  d->http_status_code = http_status_code;
 }
 
 OxideQLoadEvent::~OxideQLoadEvent() {}
@@ -108,6 +116,12 @@
   return d->error_code;
 }
 
+int OxideQLoadEvent::httpStatusCode() const {
+  Q_D(const OxideQLoadEvent);
+
+  return d->http_status_code;
+}
+
 QUrl OxideQLoadEvent::originalUrl() const {
   Q_D(const OxideQLoadEvent);
 

=== modified file 'qt/core/api/oxideqloadevent.h'
--- qt/core/api/oxideqloadevent.h	2014-12-09 17:18:01 +0000
+++ qt/core/api/oxideqloadevent.h	2015-05-15 12:21:58 +0000
@@ -34,6 +34,15 @@
   Q_PROPERTY(ErrorDomain errorDomain READ errorDomain CONSTANT)
   Q_PROPERTY(QString errorString READ errorString CONSTANT)
   Q_PROPERTY(int errorCode READ errorCode CONSTANT)
+  // The status code of the last known successful navigation.  If
+  // returns 0 that means that either:
+  //
+  //  - this navigation hasn't completed yet;
+  //  - a response wasn't received;
+  //  - or this navigation was restored and for some reason the
+  //    status code wasn't available.
+  //
+  Q_PROPERTY(int httpStatusCode READ httpStatusCode CONSTANT REVISION 2)
 
   Q_PROPERTY(QUrl originalUrl READ originalUrl CONSTANT)
 
@@ -69,13 +78,16 @@
 
   Q_DECL_HIDDEN OxideQLoadEvent(const QUrl& url,
                                 Type type,
-                                bool is_error = false);
+                                bool is_error = false,
+                                int http_status_code = -1);
   Q_DECL_HIDDEN OxideQLoadEvent(const QUrl& url,
                                 ErrorDomain error_domain,
                                 const QString& error_string,
-                                int error_code);
+                                int error_code,
+                                int http_status_code);
   Q_DECL_HIDDEN OxideQLoadEvent(const QUrl& url,
-                                const QUrl& original_url);
+                                const QUrl& original_url,
+                                int http_status_code);
   virtual ~OxideQLoadEvent();
 
   QUrl url() const;
@@ -83,6 +95,7 @@
   ErrorDomain errorDomain() const;
   QString errorString() const;
   int errorCode() const;
+  int httpStatusCode() const;
   QUrl originalUrl() const;
   bool isError() const;
 

=== modified file 'qt/core/browser/oxide_qt_web_view.cc'
--- qt/core/browser/oxide_qt_web_view.cc	2015-05-11 15:32:11 +0000
+++ qt/core/browser/oxide_qt_web_view.cc	2015-05-15 12:21:58 +0000
@@ -581,19 +581,23 @@
 }
 
 void WebView::OnLoadRedirected(const GURL& url,
-                               const GURL& original_url) {
+                               const GURL& original_url,
+                               int http_status_code) {
   OxideQLoadEvent event(
      QUrl(QString::fromStdString(url.spec())),
-     QUrl(QString::fromStdString(original_url.spec())));
+     QUrl(QString::fromStdString(original_url.spec())),
+     http_status_code);
   client_->LoadEvent(&event);
 }
 
 void WebView::OnLoadCommitted(const GURL& url,
-                              bool is_error_page) {
+                              bool is_error_page,
+                              int http_status_code) {
   OxideQLoadEvent event(
       QUrl(QString::fromStdString(url.spec())),
       OxideQLoadEvent::TypeCommitted,
-      is_error_page);
+      is_error_page,
+      http_status_code);
   client_->LoadEvent(&event);
 }
 
@@ -606,19 +610,23 @@
 
 void WebView::OnLoadFailed(const GURL& validated_url,
                            int error_code,
-                           const std::string& error_description) {
+                           const std::string& error_description,
+                           int http_status_code) {
   OxideQLoadEvent event(
       QUrl(QString::fromStdString(validated_url.spec())),
       ErrorDomainFromErrorCode(error_code),
       QString::fromStdString(error_description),
-      error_code);
+      error_code,
+      http_status_code);
   client_->LoadEvent(&event);
 }
 
-void WebView::OnLoadSucceeded(const GURL& validated_url) {
+void WebView::OnLoadSucceeded(const GURL& validated_url, int http_status_code) {
   OxideQLoadEvent event(
       QUrl(QString::fromStdString(validated_url.spec())),
-      OxideQLoadEvent::TypeSucceeded);
+      OxideQLoadEvent::TypeSucceeded,
+      false,
+      http_status_code);
   client_->LoadEvent(&event);
 }
 
@@ -1061,7 +1069,7 @@
 }
 
 bool WebView::incognito() const {
-  return IsIncognito();  
+  return IsIncognito();
 }
 
 bool WebView::loading() const {

=== modified file 'qt/core/browser/oxide_qt_web_view.h'
--- qt/core/browser/oxide_qt_web_view.h	2015-05-11 15:32:11 +0000
+++ qt/core/browser/oxide_qt_web_view.h	2015-05-15 12:21:58 +0000
@@ -113,14 +113,18 @@
 
   void OnLoadStarted(const GURL& validated_url) override;
   void OnLoadRedirected(const GURL& url,
-                        const GURL& original_url) override;
+                        const GURL& original_url,
+                        int http_status_code) override;
   void OnLoadCommitted(const GURL& url,
-                       bool is_error_page) override;
+                       bool is_error_page,
+                       int http_status_code) override;
   void OnLoadStopped(const GURL& validated_url) override;
   void OnLoadFailed(const GURL& validated_url,
                     int error_code,
-                    const std::string& error_description) override;
-  void OnLoadSucceeded(const GURL& validated_url) override;
+                    const std::string& error_description,
+                    int http_status_code) override;
+  void OnLoadSucceeded(const GURL& validated_url,
+                       int http_status_code) override;
 
   void OnNavigationEntryCommitted() override;
   void OnNavigationListPruned(bool from_front, int count) override;

=== modified file 'qt/qmlplugin/oxide_qml_plugin.cc'
--- qt/qmlplugin/oxide_qml_plugin.cc	2015-05-11 15:32:11 +0000
+++ qt/qmlplugin/oxide_qml_plugin.cc	2015-05-15 12:21:58 +0000
@@ -128,6 +128,8 @@
     qmlRegisterUncreatableType<OxideQQuickLocationBarController, 1>(uri, 1, 7, "LocationBarController",
         "LocationBarController is accessed via WebView.locationBarController");
 
+    qmlRegisterUncreatableType<OxideQLoadEvent, 2>(uri, 1, 8, "LoadEvent",
+        "LoadEvent is delivered by WebView.loadEvent");
     qmlRegisterType<OxideQQuickWebView, 4>(uri, 1, 8, "WebView");
   }
 };

=== added file 'qt/tests/qmltests/api/tst_LoadEvent_httpStatusCode.py'
--- qt/tests/qmltests/api/tst_LoadEvent_httpStatusCode.py	1970-01-01 00:00:00 +0000
+++ qt/tests/qmltests/api/tst_LoadEvent_httpStatusCode.py	2015-05-15 12:21:58 +0000
@@ -0,0 +1,21 @@
+from cStringIO import StringIO
+
+def handler(request):
+  html = StringIO()
+
+  http_status_code = int(request.path[-3:])
+
+  html.write("Request for http status code: " + str(http_status_code))
+
+  if http_status_code >= 400:
+    request.send_error(http_status_code)
+  else:
+    request.send_response(http_status_code)
+
+  if http_status_code != 204 and http_status_code != 304:
+    request.send_header("Content-type", "application/json")
+    request.send_header("Content-Length", html.tell())
+    request.send_header("Cache-Control", "no-cache")
+    request.end_headers()
+
+    request.wfile.write(html.getvalue())

=== added file 'qt/tests/qmltests/api/tst_LoadEvent_httpStatusCode.qml'
--- qt/tests/qmltests/api/tst_LoadEvent_httpStatusCode.qml	1970-01-01 00:00:00 +0000
+++ qt/tests/qmltests/api/tst_LoadEvent_httpStatusCode.qml	2015-05-15 12:21:58 +0000
@@ -0,0 +1,462 @@
+import QtQuick 2.0
+import QtTest 1.0
+import com.canonical.Oxide 1.8
+import com.canonical.Oxide.Testing 1.0
+
+TestWebView {
+  id: webView
+  width: 200
+  height: 200
+
+  property var expectedLoadEvents: []
+  property int expectedHttpStatusCode
+
+  onLoadEvent: {
+    test.verify(expectedLoadEvents.length > 0);
+    var expected = expectedLoadEvents[0];
+    expectedLoadEvents.shift();
+
+    test.compare(event.type, expected, "Unexpected type")
+
+    test.compare(event.httpStatusCode,
+                 event.type != LoadEvent.TypeStarted && event.type != LoadEvent.TypeStopped ? expectedHttpStatusCode : -1,
+                 "Unexpected value of httpStatusCode");
+  }
+
+  TestCase {
+    id: test
+    name: "LoadEvent_httpStatusCode"
+    when: windowShown
+
+    function init() {
+      webView.clearLoadEventCounters();
+      expectedLoadEvents = [];
+    }
+
+    function test_HttpStatusCode2xx_data() {
+      return [
+        {
+          tag: "200",
+          httpStatusCode: 200,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "201",
+          httpStatusCode: 201,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "202",
+          httpStatusCode: 202,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "203",
+          httpStatusCode: 203,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "204",
+          httpStatusCode: 204,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeStopped
+          ]
+        },
+        {
+          tag: "205",
+          httpStatusCode: 205,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeStopped
+          ]
+        },
+        {
+          tag: "206",
+          httpStatusCode: 206,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+      ]
+    }
+
+    function test_HttpStatusCode2xx(data) {
+      expectedHttpStatusCode = data.httpStatusCode;
+      expectedLoadEvents = data.events;
+
+      webView.url = "http://testsuite/tst_LoadEvent_httpStatusCode.py?" +
+        data.httpStatusCode;
+
+      if (data.httpStatusCode === 204 || data.httpStatusCode === 205) {
+        verify(webView.waitForLoadStopped());
+      } else {
+        verify(webView.waitForLoadSucceeded());
+      }
+    }
+
+    function test_HttpStatusCode3xx_data() {
+      return [
+        {
+          tag: "300",
+          httpStatusCode: 300,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "301",
+          httpStatusCode: 301,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "302",
+          httpStatusCode: 302,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "303",
+          httpStatusCode: 303,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "304",
+          httpStatusCode: 304,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeStopped
+          ]
+        },
+        {
+          tag: "305",
+          httpStatusCode: 305,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "306",
+          httpStatusCode: 306,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "307",
+          httpStatusCode: 307,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "308",
+          httpStatusCode: 308,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        }
+      ]
+    }
+
+    function test_HttpStatusCode3xx(data) {
+      expectedHttpStatusCode = data.httpStatusCode;
+      expectedLoadEvents = data.events;
+
+      webView.url = "http://testsuite/tst_LoadEvent_httpStatusCode.py?" +
+        data.httpStatusCode;
+
+      if (data.httpStatusCode === 304) {
+        verify(webView.waitForLoadStopped());
+      } else {
+        verify(webView.waitForLoadSucceeded());
+      }
+    }
+
+    function test_HttpStatusCode4xx_data() {
+      return [
+        {
+          tag: "400",
+          httpStatusCode: 400,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "401",
+          httpStatusCode: 401,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "403",
+          httpStatusCode: 403,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "404",
+          httpStatusCode: 404,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "405",
+          httpStatusCode: 405,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "406",
+          httpStatusCode: 406,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        // XXX: investigate on failure of this test.
+        // See https://code.launchpad.net/~rpadovani/oxide/http-status-code/+merge/256606/comments/647631
+        // {
+        //   tag: "407",
+        //   httpStatusCode: 407,
+        //   events: [
+        //     LoadEvent.TypeStarted,
+        //     LoadEvent.TypeFailed,
+        //     LoadEvent.TypeCommitted
+        //   ]
+        // },
+        {
+          tag: "408",
+          httpStatusCode: 408,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "409",
+          httpStatusCode: 409,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "410",
+          httpStatusCode: 410,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "411",
+          httpStatusCode: 411,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "412",
+          httpStatusCode: 412,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "413",
+          httpStatusCode: 413,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "414",
+          httpStatusCode: 414,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "415",
+          httpStatusCode: 415,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "416",
+          httpStatusCode: 416,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "417",
+          httpStatusCode: 417,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        }
+      ]
+    }
+
+    function test_HttpStatusCode4xx(data) {
+      expectedHttpStatusCode = data.httpStatusCode;
+      expectedLoadEvents = data.events;
+
+      webView.url = "http://testsuite/tst_LoadEvent_httpStatusCode.py?" +
+        data.httpStatusCode;
+
+      if (data.httpStatusCode === 407) {
+        verify(webView.waitForLoadCommitted());
+      } else {
+        verify(webView.waitForLoadSucceeded());
+      }
+    }
+
+    function test_HttpStatusCode5xx_data() {
+      return [
+        {
+          tag: "500",
+          httpStatusCode: 500,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "501",
+          httpStatusCode: 501,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "502",
+          httpStatusCode: 502,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "503",
+          httpStatusCode: 503,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "504",
+          httpStatusCode: 504,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        },
+        {
+          tag: "505",
+          httpStatusCode: 505,
+          events: [
+            LoadEvent.TypeStarted,
+            LoadEvent.TypeCommitted,
+            LoadEvent.TypeSucceeded
+          ]
+        }
+      ]
+    }
+
+    function test_HttpStatusCode5xx(data) {
+      expectedHttpStatusCode = data.httpStatusCode;
+      expectedLoadEvents = data.events;
+
+      webView.url = "http://testsuite/tst_LoadEvent_httpStatusCode.py?" +
+        data.httpStatusCode;
+
+      // if (data.httpStatusCode === 304) {
+      //   verify(webView.waitForLoadStopped());
+      // } else {
+        verify(webView.waitForLoadSucceeded());
+      //}
+    }
+  }
+}

=== modified file 'qt/tests/qmltests/api/tst_WebView_loading.qml'
--- qt/tests/qmltests/api/tst_WebView_loading.qml	2015-04-15 14:49:03 +0000
+++ qt/tests/qmltests/api/tst_WebView_loading.qml	2015-05-15 12:21:58 +0000
@@ -1,6 +1,6 @@
 import QtQuick 2.0
 import QtTest 1.0
-import com.canonical.Oxide 1.0
+import com.canonical.Oxide 1.8
 import com.canonical.Oxide.Testing 1.0
 
 TestWebView {
@@ -35,6 +35,10 @@
     test.compare(event.originalUrl,
                  event.type == LoadEvent.TypeRedirected ? expected.originalUrl : "",
                  "Unexpected originalUrl");
+    test.compare(event.httpStatusCode,
+                 event.type != LoadEvent.TypeStarted && event.type != LoadEvent.TypeStopped ?
+                  expected.httpStatusCode : -1,
+                 "Unexpected value of httpStatusCode");
     test.compare(loading, expected.loading,
                  "Unexpected state of WebView.loading");
   }
@@ -63,8 +67,8 @@
       var url = "http://testsuite/empty.html";
       expectedLoadEvents = [
         { type: LoadEvent.TypeStarted, url: url, loading: true },
-        { type: LoadEvent.TypeCommitted, url: url, error: false, loading: true },
-        { type: LoadEvent.TypeSucceeded, url: url, loading: false }
+        { type: LoadEvent.TypeCommitted, url: url, error: false, httpStatusCode: 200, loading: true },
+        { type: LoadEvent.TypeSucceeded, url: url, httpStatusCode: 200, loading: false }
       ];
 
       webView.url = url;
@@ -88,11 +92,11 @@
       var new_url = "http://foo.testsuite/empty.html";
       expectedLoadEvents = [
         { type: LoadEvent.TypeStarted, url: initial_url, loading: true },
-        { type: LoadEvent.TypeCommitted, url: initial_url, error: false, loading: true },
-        { type: LoadEvent.TypeSucceeded, url: initial_url, loading: false },
-        { type: LoadEvent.TypeStarted, url: new_url, loading: true }, 
-        { type: LoadEvent.TypeCommitted, url: new_url, error: false, loading: true },
-        { type: LoadEvent.TypeSucceeded, url: new_url, loading: false }
+        { type: LoadEvent.TypeCommitted, url: initial_url, httpStatusCode: 200, error: false, loading: true },
+        { type: LoadEvent.TypeSucceeded, url: initial_url, httpStatusCode: 200, loading: false },
+        { type: LoadEvent.TypeStarted, url: new_url, loading: true },
+        { type: LoadEvent.TypeCommitted, url: new_url, error: false, httpStatusCode: 200, loading: true },
+        { type: LoadEvent.TypeSucceeded, url: new_url, httpStatusCode: 200, loading: false }
       ];
 
       webView.url = initial_url;
@@ -100,7 +104,7 @@
 
       verify(!webView.loading);
       spy.clear();
-      
+
       webView.getTestApi().evaluateCode("window.location = \"" + new_url + "\";", false);
       webView.waitFor(function() { return spy.count == 2; });
 
@@ -146,8 +150,8 @@
       var url = "http://invalid/";
       expectedLoadEvents = [
         { type: LoadEvent.TypeStarted, url: url, loading: true },
-        { type: LoadEvent.TypeFailed, url: url, loading: true },
-        { type: LoadEvent.TypeCommitted, url: url, error: true, loading: true }
+        { type: LoadEvent.TypeFailed, url: url, httpStatusCode: 0, loading: true },
+        { type: LoadEvent.TypeCommitted, url: url, error: true, httpStatusCode: 0, loading: true }
       ];
 
       webView.url = url;
@@ -168,8 +172,8 @@
       spy.clear();
       expectedLoadEvents = [
         { type: LoadEvent.TypeStarted, url: url, loading: true },
-        { type: LoadEvent.TypeFailed, url: url, loading: true },
-        { type: LoadEvent.TypeCommitted, url: url, error: true, loading: true }
+        { type: LoadEvent.TypeFailed, url: url, httpStatusCode: 0, loading: true },
+        { type: LoadEvent.TypeCommitted, url: url, error: true, httpStatusCode: 0, loading: true }
       ];
       webView.reload();
 
@@ -191,9 +195,11 @@
       var url = "http://testsuite/tst_WebView_loading_redirect.py";
       expectedLoadEvents = [
         { type: LoadEvent.TypeStarted, url: url, loading: true },
-        { type: LoadEvent.TypeRedirected, url: "http://testsuite/empty.html", originalUrl: url, loading: true },
-        { type: LoadEvent.TypeCommitted, url: "http://testsuite/empty.html", error: false, loading: true },
-        { type: LoadEvent.TypeSucceeded, url: "http://testsuite/empty.html", loading: false }
+        { type: LoadEvent.TypeRedirected, url: "http://testsuite/empty.html",
+          originalUrl: url, httpStatusCode: 302, loading: true },
+        { type: LoadEvent.TypeCommitted, url: "http://testsuite/empty.html",
+          error: false, httpStatusCode: 200, loading: true },
+        { type: LoadEvent.TypeSucceeded, url: "http://testsuite/empty.html", httpStatusCode: 200, loading: false }
       ];
 
       webView.url = url;
@@ -216,10 +222,10 @@
       var initial_url = "http://testsuite/empty.html";
       var new_url = "http://testsuite/empty.html#foo";
       expectedLoadEvents = [
-        { type: LoadEvent.TypeStarted, url: initial_url, loading: true },
-        { type: LoadEvent.TypeCommitted, url: initial_url, error: false, loading: true },
-        { type: LoadEvent.TypeSucceeded, url: initial_url, loading: false },
-        { type: LoadEvent.TypeCommitted, url: new_url, error: false, loading: true }
+        { type: LoadEvent.TypeStarted, url: initial_url, httpStatusCode: 200, loading: true },
+        { type: LoadEvent.TypeCommitted, url: initial_url, error: false, httpStatusCode: 200, loading: true },
+        { type: LoadEvent.TypeSucceeded, url: initial_url, httpStatusCode: 200, loading: false },
+        { type: LoadEvent.TypeCommitted, url: new_url, error: false, httpStatusCode: 200, loading: true }
       ];
 
       webView.url = initial_url;
@@ -227,7 +233,7 @@
 
       verify(!webView.loading);
       spy.clear();
-      
+
       webView.getTestApi().evaluateCode("window.location = \"" + new_url + "\";", false);
       webView.waitFor(function() { return spy.count == 2; });
 
@@ -241,10 +247,10 @@
       var initial_url = "http://testsuite/empty.html";
       var new_url = "http://testsuite/empty.html#foo";
       expectedLoadEvents = [
-        { type: LoadEvent.TypeStarted, url: initial_url, loading: true },
-        { type: LoadEvent.TypeCommitted, url: initial_url, error: false, loading: true },
-        { type: LoadEvent.TypeSucceeded, url: initial_url, loading: false },
-        { type: LoadEvent.TypeCommitted, url: new_url, error: false, loading: true }
+        { type: LoadEvent.TypeStarted, url: initial_url, httpStatusCode: 200, loading: true },
+        { type: LoadEvent.TypeCommitted, url: initial_url, error: false, httpStatusCode: 200, loading: true },
+        { type: LoadEvent.TypeSucceeded, url: initial_url, httpStatusCode: 200, loading: false },
+        { type: LoadEvent.TypeCommitted, url: new_url, error: false, httpStatusCode: 200, loading: true }
       ];
 
       webView.url = initial_url;
@@ -288,8 +294,8 @@
       var url = "http://testsuite/tst_WebView_loading_subframe.html";
       expectedLoadEvents = [
         { type: LoadEvent.TypeStarted, url: url, loading: true },
-        { type: LoadEvent.TypeCommitted, url: url, error: false, loading: true },
-        { type: LoadEvent.TypeSucceeded, url: url, loading: false }
+        { type: LoadEvent.TypeCommitted, url: url, error: false, httpStatusCode: 200, loading: true },
+        { type: LoadEvent.TypeSucceeded, url: url, httpStatusCode: 200, loading: false }
       ];
 
       webView.url = url;

=== modified file 'shared/browser/oxide_web_view.cc'
--- shared/browser/oxide_web_view.cc	2015-05-14 15:37:57 +0000
+++ shared/browser/oxide_web_view.cc	2015-05-15 12:21:58 +0000
@@ -253,12 +253,16 @@
 
 void WebView::DispatchLoadFailed(const GURL& validated_url,
                                  int error_code,
-                                 const base::string16& error_description) {
+                                 const base::string16& error_description,
+                                 bool is_provisional_load) {
   if (error_code == net::ERR_ABORTED) {
     OnLoadStopped(validated_url);
   } else {
+    content::NavigationEntry* entry =
+      web_contents_->GetController().GetLastCommittedEntry();
     OnLoadFailed(validated_url, error_code,
-                 base::UTF16ToUTF8(error_description));
+                 base::UTF16ToUTF8(error_description),
+                 is_provisional_load ? 0 : entry->GetHttpStatusCode());
   }
 }
 
@@ -943,7 +947,8 @@
 
   content::NavigationEntry* entry =
       web_contents_->GetController().GetLastCommittedEntry();
-  OnLoadCommitted(url, entry->GetPageType() == content::PAGE_TYPE_ERROR);
+  OnLoadCommitted(url, entry->GetPageType() == content::PAGE_TYPE_ERROR,
+    entry->GetHttpStatusCode());
 }
 
 void WebView::DidFailProvisionalLoad(
@@ -958,7 +963,7 @@
 
   if (!frame->parent() &&
       validated_url.spec() != content::kUnreachableWebDataURL) {
-    DispatchLoadFailed(validated_url, error_code, error_description);
+    DispatchLoadFailed(validated_url, error_code, error_description, true);
   }
 
   if (error_code != net::ERR_ABORTED) {
@@ -1011,7 +1016,9 @@
     return;
   }
 
-  OnLoadSucceeded(validated_url);
+  content::NavigationEntry* entry =
+      web_contents_->GetController().GetLastCommittedEntry();
+  OnLoadSucceeded(validated_url, entry->GetHttpStatusCode());
 }
 
 void WebView::DidFailLoad(content::RenderFrameHost* render_frame_host,
@@ -1032,7 +1039,8 @@
     return;
   }
 
-  OnLoadRedirected(details.new_url, details.original_url);
+  OnLoadRedirected(details.new_url, details.original_url,
+      details.http_response_code);
 }
 
 void WebView::NavigationEntryCommitted(
@@ -1126,14 +1134,18 @@
 
 void WebView::OnLoadStarted(const GURL& validated_url) {}
 void WebView::OnLoadRedirected(const GURL& url,
-                               const GURL& original_url) {}
+                               const GURL& original_url,
+                               int http_status_code) {}
 void WebView::OnLoadCommitted(const GURL& url,
-                              bool is_error_page) {}
+                              bool is_error_page,
+                              int http_status_code) {}
 void WebView::OnLoadStopped(const GURL& validated_url) {}
 void WebView::OnLoadFailed(const GURL& validated_url,
                            int error_code,
-                           const std::string& error_description) {}
-void WebView::OnLoadSucceeded(const GURL& validated_url) {}
+                           const std::string& error_description,
+                           int http_status_code) {}
+void WebView::OnLoadSucceeded(const GURL& validated_url,
+                              int http_status_code) {}
 
 void WebView::OnNavigationEntryCommitted() {}
 void WebView::OnNavigationListPruned(bool from_front, int count) {}
@@ -1470,7 +1482,7 @@
   params.base_url_for_data_url = baseUrl;
   params.virtual_url_for_data_url = baseUrl.is_empty() ? GURL(url::kAboutBlankURL) : baseUrl;
   params.can_load_local_resources = true;
-  
+
   if (web_contents_) {
     web_contents_->GetController().LoadURLWithParams(params);
   } else {
@@ -2082,7 +2094,7 @@
     return;
   }
 
-  SendFakeCompositionKeyEvent(host, blink::WebInputEvent::RawKeyDown); 
+  SendFakeCompositionKeyEvent(host, blink::WebInputEvent::RawKeyDown);
   host->ImeConfirmComposition(text, replacement_range, false);
   SendFakeCompositionKeyEvent(host, blink::WebInputEvent::KeyUp);
 }
@@ -2096,7 +2108,7 @@
     return;
   }
 
-  SendFakeCompositionKeyEvent(host, blink::WebInputEvent::RawKeyDown); 
+  SendFakeCompositionKeyEvent(host, blink::WebInputEvent::RawKeyDown);
   host->ImeSetComposition(text, underlines,
                           selection_range.start(),
                           selection_range.end());

=== modified file 'shared/browser/oxide_web_view.h'
--- shared/browser/oxide_web_view.h	2015-05-14 15:37:57 +0000
+++ shared/browser/oxide_web_view.h	2015-05-15 12:21:58 +0000
@@ -282,7 +282,7 @@
                              bool strict_enforcement,
                              const base::Callback<void(bool)>& callback,
                              content::CertificateRequestResultType* result);
-                             
+
   void HandleKeyEvent(const content::NativeWebKeyboardEvent& event);
   void HandleMouseEvent(const blink::WebMouseEvent& event);
   void HandleTouchEvent(const ui::TouchEvent& event);
@@ -341,7 +341,8 @@
 
   void DispatchLoadFailed(const GURL& validated_url,
                           int error_code,
-                          const base::string16& error_description);
+                          const base::string16& error_description,
+                          bool is_provisional_load = false);
 
   void OnDidBlockDisplayingInsecureContent();
   void OnDidBlockRunningInsecureContent();
@@ -501,14 +502,18 @@
 
   virtual void OnLoadStarted(const GURL& validated_url);
   virtual void OnLoadRedirected(const GURL& url,
-                                const GURL& original_url);
+                                const GURL& original_url,
+                                int http_status_code);
   virtual void OnLoadCommitted(const GURL& url,
-                               bool is_error_page);
+                               bool is_error_page,
+                               int http_status_code);
   virtual void OnLoadStopped(const GURL& validated_url);
   virtual void OnLoadFailed(const GURL& validated_url,
                             int error_code,
-                            const std::string& error_description);
-  virtual void OnLoadSucceeded(const GURL& validated_url);
+                            const std::string& error_description,
+                            int http_status_code);
+  virtual void OnLoadSucceeded(const GURL& validated_url,
+                               int http_status_code);
 
   virtual void OnNavigationEntryCommitted();
   virtual void OnNavigationListPruned(bool from_front, int count);