head	1.2;
access;
symbols
	RELEASE_8_0_0:1.1;
locks; strict;
comment	@# @;


1.2
date	2010.02.07.21.48.44;	author beat;	state dead;
branches;
next	1.1;

1.1
date	2009.06.13.07.05.48;	author beat;	state Exp;
branches;
next	;


desc
@@


1.2
log
@- Update to 3.6

What's new in Firefox 3.6:

  * Support for the HTML5 File API
  * A change to how third-party software integrates with Firefox to
    increase stability.
  * The ability to run scripts asynchronously to speed up page load times.
  * A mechanism to prevent incompatible software from crashing Firefox.
  * Users can now change their browser's appearance with a single click,
    with built in support for Personas.
  * Firefox 3.6 will alert users about out of date plugins to keep them
    safe.
  * Open, native video can now be displayed full screen, and supports
    poster frames.
  * Support for the WOFF font format.
  * Improved JavaScript performance, overall browser responsiveness and
    startup time.
  * Support for new CSS, DOM and HTML5 web technologies.

Thanks to:	Andreas Tobler, Florian Smeets, nox@@, miwi@@ and all testers
@
text
@Index: netwerk/base/src/nsURLParsers.cpp
===================================================================
RCS file: /cvsroot/mozilla/netwerk/base/src/nsURLParsers.cpp,v
retrieving revision 1.32
diff -p -u -6 -r1.32 nsURLParsers.cpp
--- netwerk/base/src/nsURLParsers.cpp	24 Nov 2008 22:46:16 -0000	1.32
+++ netwerk/base/src/nsURLParsers.cpp	8 May 2009 01:31:15 -0000
@@@@ -385,12 +385,23 @@@@ nsBaseURLParser::ParseFileName(const cha
 }
 
 //----------------------------------------------------------------------------
 // nsNoAuthURLParser implementation
 //----------------------------------------------------------------------------
 
+NS_IMETHODIMP
+nsNoAuthURLParser::ParseAuthority(const char *auth, PRInt32 authLen,
+                                 PRUint32 *usernamePos, PRInt32 *usernameLen,
+                                 PRUint32 *passwordPos, PRInt32 *passwordLen,
+                                 PRUint32 *hostnamePos, PRInt32 *hostnameLen,
+                                 PRInt32 *port)
+{
+    NS_NOTREACHED("Shouldn't parse auth in a NoAuthURL!");
+    return NS_ERROR_UNEXPECTED;
+}
+
 void
 nsNoAuthURLParser::ParseAfterScheme(const char *spec, PRInt32 specLen,
                                     PRUint32 *authPos, PRInt32 *authLen,
                                     PRUint32 *pathPos, PRInt32 *pathLen)
 {
     NS_PRECONDITION(specLen >= 0, "unexpected");
@@@@ -416,17 +427,17 @@@@ nsNoAuthURLParser::ParseAfterScheme(cons
                     break;  
                 } 
 #endif
                 p = (const char *) memchr(spec + 2, '/', specLen - 2);
             }
             if (p) {
-                SET_RESULT(auth, 2, p - (spec + 2));
+                SET_RESULT(auth, 0, -1);
                 SET_RESULT(path, p - spec, specLen - (p - spec));
             }
             else {
-                SET_RESULT(auth, 2, specLen - 2);
+                SET_RESULT(auth, 0, -1);
                 SET_RESULT(path, 0, -1);
             }
             return;
         }
     default:
         pos = 2;
Index: netwerk/base/src/nsURLParsers.h
===================================================================
RCS file: /cvsroot/mozilla/netwerk/base/src/nsURLParsers.h,v
retrieving revision 1.4
diff -p -u -6 -r1.4 nsURLParsers.h
--- netwerk/base/src/nsURLParsers.h	18 Apr 2004 21:59:09 -0000	1.4
+++ netwerk/base/src/nsURLParsers.h	8 May 2009 01:31:15 -0000
@@@@ -67,25 +67,31 @@@@ protected:
 //     file:/foo/bar.txt      (treated equivalently)
 //     file:///foo/bar.txt
 //
 // eg. file:////foo/bar.txt   (UNC-filepath = \\foo\bar.txt)
 //
 // XXX except in this case:
-//     file://foo/bar.txt     (foo is authority)
+//     file://foo/bar.txt     (the authority "foo"  is ignored)
 //----------------------------------------------------------------------------
 
 class nsNoAuthURLParser : public nsBaseURLParser
 {
 public: 
 #if defined(XP_WIN) || defined(XP_OS2)
     NS_IMETHOD ParseFilePath(const char *, PRInt32,
                              PRUint32 *, PRInt32 *,
                              PRUint32 *, PRInt32 *,
                              PRUint32 *, PRInt32 *);
 #endif
 
+    NS_IMETHOD ParseAuthority(const char *auth, PRInt32 authLen,
+                              PRUint32 *usernamePos, PRInt32 *usernameLen,
+                              PRUint32 *passwordPos, PRInt32 *passwordLen,
+                              PRUint32 *hostnamePos, PRInt32 *hostnameLen,
+                              PRInt32 *port);
+
     void ParseAfterScheme(const char *spec, PRInt32 specLen,
                           PRUint32 *authPos, PRInt32 *authLen,
                           PRUint32 *pathPos, PRInt32 *pathLen);
 };
 
 //----------------------------------------------------------------------------
@


1.1
log
@- Backport patches to fix the following security vulnerabilities:
  CVE-2009-1834
  CVE-2009-1835
  CVE-2009-1836
  CVE-2009-1838
  CVE-2009-1841

Obtained from:	Mozilla Bugzilla
Security:	http://www.vuxml.org/freebsd/da185955-5738-11de-b857-000f20797ede.html
With hat:	Gecko gang
@
text
@@

