[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 11cd811dd4482d99a4a1b4236d8b69b10552b4d5
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 6 16:35:25 2003 +0000

            Reviewed by Ken.
    
            - fixed 3177862 -- REGRESSION: can't upload widget at www.konfabulator.com
    
            * khtml/html/html_formimpl.cpp:
            (fixUpfromUnicode): Add a call to fixLineBreaks here (and move this down below that function).
            (HTMLFormElementImpl::formData): Remove the call to fixLineBreaks here, which was being used
            on non-text form data, like files being uploaded.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3758 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index ab87a09..87924f9 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-03-06  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
+        - fixed 3177862 -- REGRESSION: can't upload widget at www.konfabulator.com
+
+        * khtml/html/html_formimpl.cpp:
+        (fixUpfromUnicode): Add a call to fixLineBreaks here (and move this down below that function).
+        (HTMLFormElementImpl::formData): Remove the call to fixLineBreaks here, which was being used
+        on non-text form data, like files being uploaded.
+
 2003-03-05  Trey Matteson  <trey at apple.com>
 
 	Autofill tweak.  In field names, replace all digits with spaces before matching
@@ -205,7 +216,6 @@
         a bit of overhead.
         (WindowQObject::installTimeout): Change parameter to UString, not Identifier.
 
->>>>>>> 1.1469
 2003-03-03  David Hyatt  <hyatt at apple.com>
 
 	I messed up when i merged Lars' quirks color patch for CSS with
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ab87a09..87924f9 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-03-06  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
+        - fixed 3177862 -- REGRESSION: can't upload widget at www.konfabulator.com
+
+        * khtml/html/html_formimpl.cpp:
+        (fixUpfromUnicode): Add a call to fixLineBreaks here (and move this down below that function).
+        (HTMLFormElementImpl::formData): Remove the call to fixLineBreaks here, which was being used
+        on non-text form data, like files being uploaded.
+
 2003-03-05  Trey Matteson  <trey at apple.com>
 
 	Autofill tweak.  In field names, replace all digits with spaces before matching
@@ -205,7 +216,6 @@
         a bit of overhead.
         (WindowQObject::installTimeout): Change parameter to UString, not Identifier.
 
->>>>>>> 1.1469
 2003-03-03  David Hyatt  <hyatt at apple.com>
 
 	I messed up when i merged Lars' quirks color patch for CSS with
diff --git a/WebCore/khtml/html/html_formimpl.cpp b/WebCore/khtml/html/html_formimpl.cpp
index 15f2e66..ab8ad2e 100644
--- a/WebCore/khtml/html/html_formimpl.cpp
+++ b/WebCore/khtml/html/html_formimpl.cpp
@@ -209,13 +209,6 @@ static QCString encodeCString(const QCString& e)
     return encoded;
 }
 
-inline static QCString fixUpfromUnicode(const QTextCodec* codec, const QString& s)
-{
-    QCString str = codec->fromUnicode(s);
-    str.truncate(str.length());
-    return str;
-}
-
 // Change plain CR and plain LF to CRLF pairs.
 static QCString fixLineBreaks(const QCString &s)
 {
@@ -265,6 +258,13 @@ static QCString fixLineBreaks(const QCString &s)
     return result;
 }
 
+inline static QCString fixUpfromUnicode(const QTextCodec* codec, const QString& s)
+{
+    QCString str = fixLineBreaks(codec->fromUnicode(s));
+    str.truncate(str.length());
+    return str;
+}
+
 #if !APPLE_CHANGES
 
 void HTMLFormElementImpl::i18nData()
@@ -416,10 +416,9 @@ QByteArray HTMLFormElementImpl::formData(bool& ok)
 
                     // append body
                     unsigned int old_size = form_data.size();
-                    QCString data = fixLineBreaks(*it);
-                    form_data.resize( old_size + hstr.length() + data.size() + 1);
+                    form_data.resize( old_size + hstr.length() + (*it).size() + 1);
                     memcpy(form_data.data() + old_size, hstr.data(), hstr.length());
-                    memcpy(form_data.data() + old_size + hstr.length(), data, data.size());
+                    memcpy(form_data.data() + old_size + hstr.length(), (*it), (*it).size());
                     form_data[form_data.size()-2] = '\r';
                     form_data[form_data.size()-1] = '\n';
                 }

-- 
WebKit Debian packaging