changed \n\r to \r\n

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/http.cpp b/src/common/http.cpp
index 90d5db12a88fecc508f5f953a63c7887c817b6fc..db4eeb851f7fada7e3dabcdcdd6106fd4b48f4d0 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -116,7 +116,7 @@ void wxHTTP::SendHeaders()
     wxString *str = (wxString *)head->Data();
 
     wxString buf;
     wxString *str = (wxString *)head->Data();
 
     wxString buf;

-    buf.Printf(wxT("%s: %s\n\r"), head->GetKeyString(), str->GetData());
+    buf.Printf(wxT("%s: %s\r\n"), head->GetKeyString(), str->GetData());

 
     const wxWX2MBbuf cbuf = buf.mb_str();
     Write(cbuf, strlen(cbuf));
 
     const wxWX2MBbuf cbuf = buf.mb_str();
     Write(cbuf, strlen(cbuf));


@@ -215,11 +215,11 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   SetFlags(wxSOCKET_NONE);
   Notify(FALSE);
 
   SetFlags(wxSOCKET_NONE);
   Notify(FALSE);
 

-  wxSprintf(buf, wxT("%s %s HTTP/1.0\n\r"), tmp_buf, tmp_str.GetData());
+  wxSprintf(buf, wxT("%s %s HTTP/1.0\r\n"), tmp_buf, tmp_str.GetData());

   const wxWX2MBbuf pathbuf = wxConvLibc.cWX2MB(buf);
   Write(pathbuf, strlen(wxMBSTRINGCAST pathbuf));
   SendHeaders();
   const wxWX2MBbuf pathbuf = wxConvLibc.cWX2MB(buf);
   Write(pathbuf, strlen(wxMBSTRINGCAST pathbuf));
   SendHeaders();

-  Write("\n\r", 2);
+  Write("\r\n", 2);

 
   m_perr = GetLine(this, tmp_str);
   if (m_perr != wxPROTO_NOERR) {
 
   m_perr = GetLine(this, tmp_str);
   if (m_perr != wxPROTO_NOERR) {

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index 7cfc3d16bb395d0ba532270bba898a6858a80e6c..d52e34447d332cbd732b280d2c8ff32b6a8b9ac1 100644 (file)
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -351,7 +351,7 @@ void wxLogGui::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
                     // debug window anyhow, but do put a timestamp
                     wxString str;
                     TimeStamp(&str);
                     // debug window anyhow, but do put a timestamp
                     wxString str;
                     TimeStamp(&str);

-                    str << szString << wxT("\n\r");
+                    str << szString << wxT("\r\n");

                     OutputDebugString(str);
                 #else
                     // send them to stderr
                     OutputDebugString(str);
                 #else
                     // send them to stderr