--- a/nettools/conntest/Engine/HttpHandler.cpp	Fri Mar 19 09:26:16 2010 +0200
+++ b/nettools/conntest/Engine/HttpHandler.cpp	Fri Apr 16 14:51:55 2010 +0300
@@ -31,7 +31,7 @@
 //const TInt KMaxSubmitSize = 2048;
 const TInt KMaxHeaderNameLen = 32;
 const TInt KMaxHeaderValueLen = 128;
-
+const TInt KMaxStatusStrLen = 32;
 
 
 // ================= MEMBER FUNCTIONS =======================
@@ -533,8 +533,10 @@
             RHTTPResponse resp = aTransaction.Response();
             TInt status = resp.StatusCode();
             RStringF statusStr = resp.StatusText();
-            TBuf<32> statusStr16;
-            statusStr16.Copy(statusStr.DesC());
+            const TDesC8& statusStrDesC = statusStr.DesC();
+            TBuf< KMaxStatusStrLen > statusStr16; 
+            statusStr16.Copy( statusStrDesC.Left( KMaxStatusStrLen ) );
+            
             TBuf<64> st;
             st.Format(_L("Status: %d (%S)\n"), status, &statusStr16);
             iConsole.PrintNotify(st);

--- a/nettools/conntest/Engine/SocketsEngine.cpp	Fri Mar 19 09:26:16 2010 +0200
+++ b/nettools/conntest/Engine/SocketsEngine.cpp	Fri Apr 16 14:51:55 2010 +0300
@@ -529,6 +529,24 @@
         text.AppendFormat( _L8("Unexpected NewCarrierActive %i\n"), aNewAP.AccessPoint() );
         iMobility->NewCarrierRejected();
         }
+    
+    // Clean up and refresh HTTP client for the new carrier
+    delete iHttpClient;
+    iHttpClient = NULL;
+    
+    TRAPD( err1, iHttpClient = CHttpClient::NewL( iConsole ) );
+    if ( err1 != KErrNone )
+        {
+        User::Panic( KPanicConnTest, EConnTestHttpClientInitializationFailed );
+        iHttpClient = NULL;
+        }
+    
+    TRAPD( err2, iHttpClient->SetHttpConnectionInfoL( ETrue, iConnection, iSocketServ ) );
+    if ( err2 != KErrNone )
+        {
+        User::Panic( KPanicConnTest, EConnTestHttpClientInitializationFailed );
+        }
+    
     iConsole.PrintNotify( text );
     }
 
@@ -1475,11 +1493,11 @@
     CleanupStack::PopAndDestroy(&appSess);
     }
 
-    // ---------------------------------------------------------
-    // CSocketsEngine::SendHttpFrameworkRequestL()
-    // Send HTTP request
-    // ---------------------------------------------------------
-    //
+// ---------------------------------------------------------
+// CSocketsEngine::SendHttpFrameworkRequestL()
+// Send HTTP request
+// ---------------------------------------------------------
+//
 void CSocketsEngine::SendHttpFrameworkRequestL( TBool aHasBody,
         TBool aDoPerformance,
         TBool aIsSecure )

--- a/nettools/conntest/inc/ConnTest.pan	Fri Mar 19 09:26:16 2010 +0200
+++ b/nettools/conntest/inc/ConnTest.pan	Fri Apr 16 14:51:55 2010 +0300
@@ -30,8 +30,9 @@
     EConnTestBasicUi = 1,
     EConnTestBadStatus,
     EConnTestAppView,
-	EConnTestContainer,
-	EConnTestBadRoamingStatus
+    EConnTestContainer,
+    EConnTestBadRoamingStatus,
+    EConnTestHttpClientInitializationFailed
     // add further panics here
     };
 

--- a/nettools/conntest/src/ConnTestView.cpp	Fri Mar 19 09:26:16 2010 +0200
+++ b/nettools/conntest/src/ConnTestView.cpp	Fri Apr 16 14:51:55 2010 +0300
@@ -1219,7 +1219,18 @@
     TDateTime time = currentTime.DateTime();
     text.AppendFormat(_L8("%02u:%02u:%02u "),
         time.Hour(), time.Minute(), time.Second() );
-    text.AppendFormat(_L8("Wlan: RssChanged: %d, %d\n"), aRssClass, aRss);
+    if ( aRssClass == EWlanRssClassNormal )
+        {
+        text.AppendFormat(_L8("Wlan RSS: -%ddBm (good)\f"), aRss);
+        }
+    else if ( aRssClass == EWlanRssClassWeak )
+        {
+        text.AppendFormat(_L8("Wlan RSS: -%ddBm (weak)\f"), aRss);
+        }
+    else
+        {
+        text.AppendFormat(_L8("Wlan RSS: -%ddBm (unknown)\f"), aRss);
+        }
     iContainer->PrintNotify(text);
     }
 

--- a/package_definition.xml	Fri Mar 19 09:26:16 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="conntools" name="Connectivity Tools" levels="config app">
-    <collection id="nettools" name="Net Tools" level="app">
-      <component id="conntest" filter="s60" name="Connection Test" purpose="development">
-        <unit bldFile="nettools/conntest/group"/>
-      </component>
-    </collection>
-    <collection id="emulatorlan" name="Emulator LAN" level="config">
-      <component id="emulatorlan_build" filter="s60" name="Emulator LAN Build" class="config" purpose="development">
-        <unit bldFile="emulatorlan/group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>