--- a/nettools/conntest/Engine/HttpHandler.cpp	Mon Mar 15 12:39:11 2010 +0200
+++ b/nettools/conntest/Engine/HttpHandler.cpp	Wed Mar 31 21:08:37 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/package_definition.xml	Mon Mar 15 12:39:11 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>