[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:41:35 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit ecea87d16deee68f86230bb1124c83a9aee73051
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun May 11 00:32:21 2003 +0000
Tests:
Reviewed by Maciej.
- update tests for removal of prettyURL parameter, added a new test for mailto URLs with subjects
* TestURLs.h: Added "mailto:mduerst at ifi.unizh.ch?Subject=nothing".
* kde/kurl-test.chk: Removed prettyURL(1) and prettyURL(-1) tests. Added test results for new URL.
* kde/kurl-test.cpp: (testURL): Removed prettyURL(1) and prettyURL(-1) tests.
* test.list: Removed ifnsthreadextensions-test.
WebCore:
Reviewed by Maciej.
- fixed 3206695 -- Safari puts all of the mailto form content in email subject line, should put content in body
The bug was caused by our KURL class not parsing the query out of the mailto URL properly.
* kwq/KWQKURL.h: Removed parameter from prettyURL, unused in KHTML.
* kwq/KWQKURL.mm:
(KURL::prettyURL): Removed parameter, unused in KHTML.
(KURL::parse): Parse queries even from non-hierarchical URLs. This fixes the bug.
* WebCore-tests.exp: Updated for parameter removed from prettyURL.
* WebCore-combined.exp: Regenerated.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4344 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b4deae7..dc2bc11 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,19 @@
+2003-05-10 Darin Adler <darin at apple.com>
+
+ Reviewed by Maciej.
+
+ - fixed 3206695 -- Safari puts all of the mailto form content in email subject line, should put content in body
+
+ The bug was caused by our KURL class not parsing the query out of the mailto URL properly.
+
+ * kwq/KWQKURL.h: Removed parameter from prettyURL, unused in KHTML.
+ * kwq/KWQKURL.mm:
+ (KURL::prettyURL): Removed parameter, unused in KHTML.
+ (KURL::parse): Parse queries even from non-hierarchical URLs. This fixes the bug.
+
+ * WebCore-tests.exp: Updated for parameter removed from prettyURL.
+ * WebCore-combined.exp: Regenerated.
+
2003-05-09 Darin Adler <darin at apple.com>
Reviewed by Maciej.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b4deae7..dc2bc11 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,19 @@
+2003-05-10 Darin Adler <darin at apple.com>
+
+ Reviewed by Maciej.
+
+ - fixed 3206695 -- Safari puts all of the mailto form content in email subject line, should put content in body
+
+ The bug was caused by our KURL class not parsing the query out of the mailto URL properly.
+
+ * kwq/KWQKURL.h: Removed parameter from prettyURL, unused in KHTML.
+ * kwq/KWQKURL.mm:
+ (KURL::prettyURL): Removed parameter, unused in KHTML.
+ (KURL::parse): Parse queries even from non-hierarchical URLs. This fixes the bug.
+
+ * WebCore-tests.exp: Updated for parameter removed from prettyURL.
+ * WebCore-combined.exp: Regenerated.
+
2003-05-09 Darin Adler <darin at apple.com>
Reviewed by Maciej.
diff --git a/WebCore/WebCore-combined.exp b/WebCore/WebCore-combined.exp
index 5aad1f1..f0187e2 100644
--- a/WebCore/WebCore-combined.exp
+++ b/WebCore/WebCore-combined.exp
@@ -235,7 +235,7 @@ __ZNK4KURL5queryEv
__ZNK4KURL7hasPathEv
__ZNK4KURL7isEmptyEv
__ZNK4KURL8protocolEv
-__ZNK4KURL9prettyURLEi
+__ZNK4KURL9prettyURLEv
__ZNK5QChar16isLetterOrNumberEv
__ZNK5QChar5lowerEv
__ZNK5QChar5upperEv
diff --git a/WebCore/WebCore-tests.exp b/WebCore/WebCore-tests.exp
index 7d18549..f69e354 100644
--- a/WebCore/WebCore-tests.exp
+++ b/WebCore/WebCore-tests.exp
@@ -212,7 +212,7 @@ __ZNK4KURL5queryEv
__ZNK4KURL7hasPathEv
__ZNK4KURL7isEmptyEv
__ZNK4KURL8protocolEv
-__ZNK4KURL9prettyURLEi
+__ZNK4KURL9prettyURLEv
__ZNK5QChar16isLetterOrNumberEv
__ZNK5QChar5lowerEv
__ZNK5QChar5upperEv
diff --git a/WebCore/kwq/KWQKURL.h b/WebCore/kwq/KWQKURL.h
index c9f19b5..e1e08fe 100644
--- a/WebCore/kwq/KWQKURL.h
+++ b/WebCore/kwq/KWQKURL.h
@@ -65,7 +65,7 @@ public:
void setQuery(const QString &, int encoding_hint=0);
void setPath(const QString &);
- QString prettyURL(int trailing=0) const;
+ QString prettyURL() const;
static QString decode_string(const QString &);
static QString encode_string(const QString &);
diff --git a/WebCore/kwq/KWQKURL.mm b/WebCore/kwq/KWQKURL.mm
index 95bcca2..1e8a6a5 100644
--- a/WebCore/kwq/KWQKURL.mm
+++ b/WebCore/kwq/KWQKURL.mm
@@ -668,7 +668,7 @@ QString KURL::canonicalURL() const
}
-QString KURL::prettyURL(int trailing) const
+QString KURL::prettyURL() const
{
if (!m_isValid) {
return urlString;
@@ -694,19 +694,7 @@ QString KURL::prettyURL(int trailing) const
result += "//" + authority;
}
- QString path = this->path();
-
- if (trailing == 1) {
- if (path.right(1) != "/" && !path.isEmpty()) {
- path += "/";
- }
- } else if (trailing == -1) {
- if (path.right(1) == "/" && path.length() > 1) {
- path = path.left(path.length()-1);
- }
- }
-
- result += path;
+ result += path();
result += query();
if (fragmentEndPos != queryEndPos) {
@@ -931,34 +919,21 @@ void KURL::parse(const char *url, const QString *originalString)
}
int pathStart = portEnd;
- int pathEnd;
- int queryStart;
- int queryEnd;
- int fragmentStart;
- int fragmentEnd;
-
- if (!hierarchical) {
- pathEnd = strlen(url);
- while (url[pathEnd] != '\0' && url[pathEnd] != '#') {
- pathEnd++;
- }
- queryStart = queryEnd = pathEnd;
- } else {
- pathEnd = pathStart;
- while (url[pathEnd] != '\0' && url[pathEnd] != '?' && url[pathEnd] != '#') {
- pathEnd++;
- }
-
- queryStart = queryEnd = pathEnd;
+ int pathEnd = pathStart;
+ while (url[pathEnd] != '\0' && url[pathEnd] != '?' && url[pathEnd] != '#') {
+ pathEnd++;
+ }
- if (url[queryStart] == '?') {
- while (url[queryEnd] != '\0' && url[queryEnd] != '#') {
- queryEnd++;
- }
- }
+ int queryStart = pathEnd;
+ int queryEnd = queryStart;
+ if (url[queryStart] == '?') {
+ while (url[queryEnd] != '\0' && url[queryEnd] != '#') {
+ queryEnd++;
+ }
}
- fragmentStart = fragmentEnd = queryEnd;
+ int fragmentStart = queryEnd;
+ int fragmentEnd = fragmentStart;
if (url[fragmentStart] == '#') {
fragmentStart++;
fragmentEnd = fragmentStart;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list