rhodes 3.0.2 → 3.1.0.beta.1

data/platform/shared/net/CompatWince.cpp

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 //#include <windows.h>
 //#include <time.h>
 #include "common/RhoPort.h"

data/platform/shared/net/CompatWince.h

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #ifndef RHO_SHARED_NET_5686566c7ccb458784a377272387d53a
 #define RHO_SHARED_NET_5686566c7ccb458784a377272387d53a
 

data/platform/shared/net/HttpServer.cpp

@@ -1,12 +1,39 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "net/HttpServer.h"
 #include "common/RhodesApp.h"
 #include "common/RhoFilePath.h"
+#include "common/RhoConf.h"
 #include "net/URI.h"
 #include "ruby/ext/rho/rhoruby.h"
 
 #include <algorithm>
 
-#if !defined(OS_WINDOWS) && !defined(OS_WINCE)
+#if !defined(WINDOWS_PLATFORM)
 #include <arpa/inet.h>
 #endif
 
@@ -24,7 +51,7 @@ char *strerror(int errnum ){return "";}
 
 #endif
 
-#if defined(OS_WINDOWS) || defined(OS_WINCE)
+#if defined(WINDOWS_PLATFORM)
 typedef unsigned __int16 uint16_t;
 
 #  ifndef S_ISDIR
@@ -355,7 +382,7 @@ bool CHttpServer::init()
         return false;
     }
     
-    RAWTRACE1("Listen for connections on port %d", m_port);
+    RAWLOG_INFO1("Listen for connections on port %d", m_port);
     return true;
 }
 
@@ -396,7 +423,7 @@ bool CHttpServer::run()
                     return true;
                 }
                 if (conn == INVALID_SOCKET) {
-        #if !defined(OS_WINDOWS) && !defined(OS_WINCE)
+        #if !defined(WINDOWS_PLATFORM)
                     if (RHO_NET_ERROR_CODE == EINTR)
                         continue;
         #endif
@@ -405,8 +432,10 @@ bool CHttpServer::run()
                 }
 
                 RAWTRACE("Connection accepted, process it...");
+                VALUE val = rho_ruby_disable_gc();
                 bProcessed = process(conn);
-
+                rho_ruby_enable_gc(val);
+                
                 RAWTRACE("Close connected socket");
                 closesocket(conn);
             }
@@ -419,7 +448,7 @@ bool CHttpServer::run()
             return false;
         }
 
-        if ( bProcessed )
+        //if ( bProcessed )
             rb_gc();
     }
 }
@@ -474,7 +503,7 @@ bool CHttpServer::receive_request(ByteVector &request)
         int n = recv(m_sock, &buf[0], sizeof(buf), 0);
         if (n == -1) {
             int e = RHO_NET_ERROR_CODE;
-#if !defined(OS_WINDOWS) && !defined(OS_WINCE)
+#if !defined(WINDOWS_PLATFORM)
             if (e == EINTR)
                 continue;
 #else
@@ -507,7 +536,8 @@ bool CHttpServer::receive_request(ByteVector &request)
     
     if (!r.empty()) {
         request.insert(request.end(), r.begin(), r.end());
-        RAWTRACE1("Received request:\n%s", &request[0]);
+        if ( !rho_conf_getBool("log_skip_post") )
+            RAWTRACE1("Received request:\n%s", &request[0]);
     }
     return true;
 }
@@ -522,7 +552,7 @@ bool CHttpServer::send_response_impl(String const &data, bool continuation)
     }
     
     // First of all, make socket blocking
-#if defined(OS_WINDOWS) || defined(OS_WINCE)
+#if defined(WINDOWS_PLATFORM)
     unsigned long optval = 0;
         if(::ioctlsocket(m_sock, FIONBIO, &optval) == SOCKET_ERROR) {
         RAWLOG_ERROR1("Can not set blocking socket mode: %d", RHO_NET_ERROR_CODE);
@@ -545,7 +575,7 @@ bool CHttpServer::send_response_impl(String const &data, bool continuation)
         int n = send(m_sock, data.c_str() + pos, data.size() - pos, 0);
         if (n == -1) {
             int e = RHO_NET_ERROR_CODE;
-#if !defined(OS_WINDOWS) && !defined(OS_WINCE)
+#if !defined(WINDOWS_PLATFORM)
             if (e == EINTR)
                 continue;
 #endif
@@ -564,8 +594,9 @@ bool CHttpServer::send_response_impl(String const &data, bool continuation)
     //RAWTRACE2("Sent response:\n%s%s", dbg_response.c_str(), response.size() > 100 ? "..." : "   ");
     if (continuation)
         RAWTRACE1("Sent response body: %d bytes", data.size());
-    else
+    else if ( !rho_conf_getBool("log_skip_post") )
         RAWTRACE1("Sent response (only headers displayed):\n%s", data.c_str());
+
     return true;
 }
 
@@ -629,7 +660,7 @@ bool CHttpServer::process(SOCKET sock)
     m_sock = sock;
 
 	// First of all, make socket non-blocking
-#if defined(OS_WINDOWS) || defined(OS_WINCE)
+#if defined(WINDOWS_PLATFORM)
 	unsigned long optval = 1;
 	if(::ioctlsocket(m_sock, FIONBIO, &optval) == SOCKET_ERROR) {
 		RAWLOG_ERROR1("Can not set non-blocking socket mode: %d", RHO_NET_ERROR_CODE);
@@ -860,15 +891,15 @@ bool CHttpServer::dispatch(String const &uri, Route &route)
         if(tmpstr[i] >= 'A' && tmpstr[i] <= 'Z') {
             if(i == 0) {
                 tmp[0] = tmpstr[i] + 0x20;
-                tmp[1] = NULL;
+                tmp[1] = '\0';
             } else {
                 tmp[0] = '_';
                 tmp[1] = tmpstr[i] + 0x20;
-                tmp[2] = NULL;
+                tmp[2] = '\0';
             }
         } else {
             tmp[0] = tmpstr[i];
-            tmp[1] = NULL;
+            tmp[1] = '\0';
         }
         controllerName += tmp;
     }
@@ -923,6 +954,7 @@ static bool parse_range(HttpHeaderList const &hdrs, size_t *pbegin, size_t *pend
 bool CHttpServer::send_file(String const &path, HeaderList const &hdrs)
 {
     String fullPath = CFilePath::normalizePath(path);
+
     if (String_startsWith(fullPath,"/app/db/db-files") )
         fullPath = CFilePath::join( RHODESAPP().getRhoRootPath(), path.substr(4) );
     else if (fullPath.find(m_root) != 0 && fullPath.find(m_strRhoRoot) != 0)
@@ -931,7 +963,28 @@ bool CHttpServer::send_file(String const &path, HeaderList const &hdrs)
     if (verbose) RAWTRACE1("Sending file %s...", fullPath.c_str());
     
     struct stat st;
-    if (stat(fullPath.c_str(), &st) != 0 || !S_ISREG(st.st_mode)) {
+    bool bCheckExist = true;
+#ifdef RHODES_EMULATOR
+    String strPlatform = RHOSIMCONF().getString("platform");
+    if ( strPlatform.length() > 0 )
+    {
+        String fullPath1 = fullPath;
+        int nDot = fullPath1.rfind('.');
+        if ( nDot >= 0 )
+            fullPath1.insert(nDot, String(".") + strPlatform);
+        else
+            fullPath1 += String(".") + strPlatform;
+
+        if (stat(fullPath1.c_str(), &st) == 0 && S_ISREG(st.st_mode))
+        {
+            fullPath = fullPath1;
+            bCheckExist = false;
+        }
+    }
+
+#endif
+
+    if ( bCheckExist && (stat(fullPath.c_str(), &st) != 0 || !S_ISREG(st.st_mode))) {
         RAWLOG_ERROR1("The file %s was not found", path.c_str());
         String error = "<html><font size=\"+4\"><h2>404 Not Found.</h2> The file " + path + " was not found.</font></html>";
         send_response(create_response("404 Not Found",error));
@@ -954,7 +1007,7 @@ bool CHttpServer::send_file(String const &path, HeaderList const &hdrs)
     //headers.push_back(Header("Cache-Control", "max-age=2592000") );
 
     // Content length
-    char buf[FILE_BUF_SIZE];
+    char* buf = new char[FILE_BUF_SIZE];
     
     String start_line;
     
@@ -969,13 +1022,14 @@ bool CHttpServer::send_file(String const &path, HeaderList const &hdrs)
             range_begin = range_end - 1;
         content_size = range_end - range_begin + 1;
         
-        snprintf(buf, sizeof(buf), "bytes %lu-%lu/%lu", (unsigned long)range_begin,
+        snprintf(buf, FILE_BUF_SIZE, "bytes %lu-%lu/%lu", (unsigned long)range_begin,
                  (unsigned long)range_end, (unsigned long)file_size);
         headers.push_back(Header("Content-Range", buf));
         
         if (fseek(fp, range_begin, SEEK_SET) == -1) {
             RAWLOG_ERROR1("Can not seek to specified range start: %lu", (unsigned long)range_begin);
             fclose(fp);
+            delete buf;
             return false;
         }
         
@@ -986,13 +1040,14 @@ bool CHttpServer::send_file(String const &path, HeaderList const &hdrs)
     }
 
     
-    snprintf(buf, sizeof(buf), "%lu", (unsigned long)content_size);
+    snprintf(buf, FILE_BUF_SIZE, "%lu", (unsigned long)content_size);
     headers.push_back(Header("Content-Length", buf));
     
     // Send headers
     if (!send_response(create_response(start_line, headers))) {
         RAWLOG_ERROR1("Can not send headers while sending file %s", path.c_str());
         fclose(fp);
+        delete buf;
         return false;
     }
     
@@ -1002,17 +1057,19 @@ bool CHttpServer::send_file(String const &path, HeaderList const &hdrs)
         if (need_to_read == 0)
             break;
         
-        if (need_to_read > sizeof(buf))
-            need_to_read = sizeof(buf);
-        size_t n = fread(buf, 1, need_to_read, fp);
+        if (need_to_read > FILE_BUF_SIZE)
+            need_to_read = FILE_BUF_SIZE;
+        size_t n = fread(buf, 1, need_to_read, fp);//fread(buf, 1, need_to_read, fp);
         if (n < 0) {
             RAWLOG_ERROR2("Can not read part of file (at position %lu): %s", (unsigned long)start, strerror(errno));
             fclose(fp);
+            delete buf;
             return false;
         }
         if (n == 0) {
             RAWLOG_ERROR1("End of file reached, but we expect data (%lu bytes)", (unsigned long)need_to_read);
             fclose(fp);
+            delete buf;
             return false;
         }
         
@@ -1021,11 +1078,13 @@ bool CHttpServer::send_file(String const &path, HeaderList const &hdrs)
         if (!send_response_body(String(buf, n))) {
             RAWLOG_ERROR1("Can not send part of data while sending file %s", path.c_str());
             fclose(fp);
+            delete buf;
             return false;
         }
     }
-    
+
     fclose(fp);
+    delete buf;
     if (verbose) RAWTRACE1("File %s was sent successfully", path.c_str());
     return true;
 }

data/platform/shared/net/HttpServer.h

@@ -1,10 +1,36 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #ifndef RHO_HTTP_SERVER_F5FFD21AD3EE463E850C5E2C789397BD
 #define RHO_HTTP_SERVER_F5FFD21AD3EE463E850C5E2C789397BD
 
 #include "common/RhoStd.h"
 #include "logging/RhoLog.h"
 
-#if !defined(OS_WINDOWS) && !defined(OS_WINCE)
+#if !defined(WINDOWS_PLATFORM)
 typedef int SOCKET;
 #  define INVALID_SOCKET -1
 #  define SOCKET_ERROR -1

data/platform/shared/net/INetRequest.cpp

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "INetRequest.h"
 
 #include "common/RhoFile.h"

data/platform/shared/net/INetRequest.h

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #pragma once
 
 #include "common/RhoStd.h"

data/platform/shared/net/RawSocket.cpp

@@ -1,9 +1,35 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "net/RawSocket.h"
 #include "common/RhodesApp.h"
 
 #include <algorithm>
 
-#if !defined(OS_WINDOWS) && !defined(OS_WINCE)
+#if !defined(WINDOWS_PLATFORM)
 #include <arpa/inet.h>
 #endif
 
@@ -45,14 +71,14 @@ namespace net
 
 bool RawSocket::init()
 {
-    RAWTRACE("Init raw socket");
+    //RAWTRACE("Init raw socket");
     m_isInit = create();
     return m_isInit;
 }
 
 bool RawSocket::create()
 {
-    RAWTRACE("Start create raw socket");
+    //RAWTRACE("Start create raw socket");
     cleanup();
 
     int iResult;
@@ -63,39 +89,39 @@ bool RawSocket::create()
     hints.ai_socktype = SOCK_STREAM;
     hints.ai_protocol = IPPROTO_TCP;
 
-    RAWTRACE("Get host adress");
+    //RAWTRACE("Get host adress");
 
     // Resolve the server address and port
     iResult = getaddrinfo(m_hostName.c_str(), m_hostPort.c_str(), &hints, &addrInfo);
 
     if (iResult != 0) {
-        RAWTRACE2("Unable to get addres info for host %s, port %s", m_hostName.c_str(), m_hostPort.c_str());
+        //RAWTRACE2("Unable to get addres info for host %s, port %s", m_hostName.c_str(), m_hostPort.c_str());
         return false;
     }
 
-    RAWTRACE("Create socket");
+    //RAWTRACE("Create socket");
     // Create a SOCKET for connecting to server
     m_clientSocket = socket(addrInfo->ai_family, addrInfo->ai_socktype, addrInfo->ai_protocol);
 
     if (m_clientSocket == INVALID_SOCKET) {
-        RAWTRACE2("Socket can`t create for host %s, port %s", m_hostName.c_str(), m_hostPort.c_str());
+        //RAWTRACE2("Socket can`t create for host %s, port %s", m_hostName.c_str(), m_hostPort.c_str());
         freeaddrinfo(addrInfo);
         return false;
     }
 
     // Connect to server.
-    RAWTRACE("Connect to server");
+    //RAWTRACE("Connect to server");
     iResult = connect(m_clientSocket, addrInfo->ai_addr, (int)addrInfo->ai_addrlen);
 
     if (iResult == SOCKET_ERROR) {
-        RAWTRACE2("Can`t connect to host %s, port %s ", m_hostName.c_str(), m_hostPort.c_str());
+        //RAWTRACE2("Can`t connect to host %s, port %s ", m_hostName.c_str(), m_hostPort.c_str());
         cleanup();
         return false;
     }
 
     freeaddrinfo(addrInfo);
 
-    RAWTRACE("End of socket creating");
+    //RAWTRACE("End of socket creating");
 
     return true;
 }
@@ -109,7 +135,7 @@ bool RawSocket::send(const String& sendData)
 
     if (iResult == SOCKET_ERROR) 
     {
-        RAWTRACE2("Data not send for host %s, port %s", m_hostName.c_str(), m_hostPort.c_str());
+        //RAWTRACE2("Data not send for host %s, port %s", m_hostName.c_str(), m_hostPort.c_str());
         cleanup();
         return false;
     }
@@ -127,4 +153,4 @@ void RawSocket::cleanup()
 } // namespace net
 } // namespace rho
 
-#endif
+#endif