--- a/webengine/osswebengine/WebKit/s60/misc/WebUtil.cpp Thu Aug 19 10:58:56 2010 +0300
+++ b/webengine/osswebengine/WebKit/s60/misc/WebUtil.cpp Tue Aug 31 16:17:46 2010 +0300
@@ -22,7 +22,7 @@
#include "Cache.h"
#include "DocLoader.h"
#include "IntPoint.h"
-#include "String.h"
+#include "string.h"
#include "HTMLNames.h"
#include "EventNames.h"
#include "HTMLInputElement.h"
@@ -40,13 +40,13 @@
#include "StaticObjectsContainer.h"
#include "SelectionController.h"
#include "WebUtil.h"
-#include "errordefs.h"
+#include "ErrorDefs.h"
#include "RenderListBox.h"
#include "RenderTextControl.h"
#include "RenderView.h"
#include "PlatformScrollbar.h"
#include "HTMLSelectElement.h"
-#include "webkitlogger.h"
+#include "WebKitLogger.h"
#include <StringLoader.h>
#include <sslerr.h>
#include <httperr.h>
@@ -119,7 +119,7 @@
elType = ((HTMLInputElement*)ie)->checked() ? TBrCtlDefs::EElementRadioButtonSelected : TBrCtlDefs::EElementRadioButtonUnSelected;
else if (ie->type() == "checkbox")
elType = ((HTMLInputElement*)ie)->checked() ? TBrCtlDefs::EElementCheckBoxChecked : TBrCtlDefs::EElementCheckBoxUnChecked;
- else if (ie->hasLocalName( buttonTag )||ie->type() == "button" || ie->type() == "reset" || ie->type() == "submit")
+ else if (ie->type() == "button" || ie->type() == "reset" || ie->type() == "submit")
elType = TBrCtlDefs::EElementButton;
else if (ie->type() == "file") {
if (((HTMLInputElement*)ie)->value() == String())
@@ -628,9 +628,7 @@
err == KErrHttpCannotEstablishTunnel) {
return KErrSSLAlertHandshakeFailure;
}
- //Deal With Socket error
- if( err <= KErrNetUnreach && err >= KErrUrgentData )
- return err;
+
// Deal with DNS lookup errors
if ((err <= KErrInet6NoDestination) && (err > (KErrInet6NoDestination - 200))) {
return KBrowserHTTP502;