Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge trunk changes.

Browse Source 
git-svn-id: svn://10.0.0.236/branches/ZAP_20050610_BRANCH@193326 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alex%croczilla.com
2006-03-31 13:27:53 +00:00
parent 86bfc212d1
commit 134bbb58df
5 changed files with 61 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/config/autoconf.mk.in
View File

@@ -20,7 +20,7 @@
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Benjamin Smedberg <benjamin@smedbergs.us>
# Benjamin Smedberg <benjamin@smedbergs.us>
#
# Alternatively, the contents of this file may be used under the terms of
# either of the GNU General Public License Version 2 or later (the "GPL"),

81
mozilla/configure.in
View File

@@ -1,42 +1,61 @@
dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; -*-
dnl vi: set tabstop=4 shiftwidth=4 expandtab:
dnl The contents of this file are subject to the Mozilla Public
dnl License Version 1.1 (the "License"); you may not use this file
dnl except in compliance with the License. You may obtain a copy of
dnl the License at http://www.mozilla.org/MPL/
dnl ***** BEGIN LICENSE BLOCK *****
dnl Version: MPL 1.1/GPL 2.0/LGPL 2.1
dnl
dnl Software distributed under the License is distributed on an "AS
dnl IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
dnl implied. See the License for the specific language governing
dnl rights and limitations under the License.
dnl The contents of this file are subject to the Mozilla Public License Version
dnl 1.1 (the "License"); you may not use this file except in compliance with
dnl the License. You may obtain a copy of the License at
dnl http://www.mozilla.org/MPL/
dnl
dnl Software distributed under the License is distributed on an "AS IS" basis,
dnl WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
dnl for the specific language governing rights and limitations under the
dnl License.
dnl
dnl The Original Code is this file as it was released upon August 6, 1998.
dnl
dnl The Initial Developer of the Original Code is Christopher
dnl Seawood. Portions created by Christopher Seawood are
dnl Copyright (C) 1998-2001 Christopher Seawood. All Rights Reserved.
dnl The Initial Developer of the Original Code is
dnl Christopher Seawood.
dnl Portions created by the Initial Developer are Copyright (C) 1998-2001
dnl the Initial Developer. All Rights Reserved.
dnl
dnl Contributor(s): Jamie Zawinski <jwz@jwz.org>
dnl gettimeofday args check
dnl Christopher Blizzard <blizzard@appliedtheory.com>
dnl gnomefe update & enable-pthreads
dnl Ramiro Estrugo <ramiro@netscape.com>
dnl X11 makedepend support
dnl Insure support.
dnl Henry Sobotka <sobotka@axess.com>
dnl OS/2 support
dnl Dan Mosedale <dmose@mozilla.org>
dnl LDAP support
dnl Seth Spitzer <sspitzer@netscape.com>
dnl xpctools support
dnl Benjamin Smedberg <benjamin@smedbergs.us>
dnl Howard Chu <hyc@symas.com>
dnl MSYS support
dnl Mark Mentovai <mark@moxienet.com>:
dnl Mac OS X 10.4 support
dnl Giorgio Maone <g.maone@informaction.com>
dnl MSVC l10n compatible version check
dnl Contributor(s):
dnl Jamie Zawinski <jwz@jwz.org>
dnl gettimeofday args check
dnl Christopher Blizzard <blizzard@appliedtheory.com>
dnl gnomefe update & enable-pthreads
dnl Ramiro Estrugo <ramiro@netscape.com>
dnl X11 makedepend support
dnl Insure support.
dnl Henry Sobotka <sobotka@axess.com>
dnl OS/2 support
dnl Dan Mosedale <dmose@mozilla.org>
dnl LDAP support
dnl Seth Spitzer <sspitzer@netscape.com>
dnl xpctools support
dnl Benjamin Smedberg <benjamin@smedbergs.us>
dnl Howard Chu <hyc@symas.com>
dnl MSYS support
dnl Mark Mentovai <mark@moxienet.com>:
dnl Mac OS X 10.4 support
dnl Giorgio Maone <g.maone@informaction.com>
dnl MSVC l10n compatible version check
dnl
dnl Alternatively, the contents of this file may be used under the terms of
dnl either the GNU General Public License Version 2 or later (the "GPL"), or
dnl the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
dnl in which case the provisions of the GPL or the LGPL are applicable instead
dnl of those above. If you wish to allow use of your version of this file only
dnl under the terms of either the GPL or the LGPL, and not to allow others to
dnl use your version of this file under the terms of the MPL, indicate your
dnl decision by deleting the provisions above and replace them with the notice
dnl and other provisions required by the GPL or the LGPL. If you do not delete
dnl the provisions above, a recipient may use your version of this file under
dnl the terms of any one of the MPL, the GPL or the LGPL.
dnl
dnl ***** END LICENSE BLOCK *****
dnl Process this file with autoconf to produce a configure script.
dnl ========================================================

2
mozilla/js/src/xpconnect/src/xpcprivate.h
View File

@@ -763,7 +763,7 @@ public:
nsIXPCSecurityManager* GetAppropriateSecurityManager(PRUint16 flags) const
{
NS_WARN_IF_FALSE(CallerTypeIsKnown(),"missing caller type set somewhere");
NS_ASSERTION(CallerTypeIsKnown(),"missing caller type set somewhere");
if(!CallerTypeIsJavaScript())
return nsnull;
if(mSecurityManager)

2
mozilla/netwerk/base/public/Makefile.in
View File

@@ -80,6 +80,7 @@ XPIDLSRCS = \
nsIProgressEventSink.idl \
nsIPrompt.idl \
nsIProtocolProxyService.idl \
nsIProtocolProxyService2.idl \
nsIProtocolProxyFilter.idl \
nsIProtocolProxyCallback.idl \
nsIProxiedProtocolHandler.idl \
@@ -112,7 +113,6 @@ XPIDLSRCS = \
nsIAuthModule.idl \
nsIContentSniffer.idl \
nsIAuthPromptProvider.idl \
nsPIProtocolProxyService.idl \
nsPISocketTransportService.idl \
nsIChannelEventSink.idl \
nsINetUtil.idl \

9
mozilla/netwerk/build/nsNetModule.cpp
View File

@@ -39,6 +39,7 @@
#include "nsCOMPtr.h"
#include "nsIModule.h"
#include "nsIClassInfoImpl.h"
#include "nsIGenericFactory.h"
#include "nsIComponentManager.h"
#include "nsIServiceManager.h"
@@ -79,6 +80,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsDNSService, Init)
#include "nsProtocolProxyService.h"
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsProtocolProxyService, Init)
NS_DECL_CLASSINFO(nsProtocolProxyService)
#include "nsStreamTransportService.h"
NS_GENERIC_FACTORY_CONSTRUCTOR(nsStreamTransportService)
@@ -769,7 +771,12 @@ static const nsModuleComponentInfo gNetModuleInfo[] = {
{ NS_PROTOCOLPROXYSERVICE_CLASSNAME,
NS_PROTOCOLPROXYSERVICE_CID,
NS_PROTOCOLPROXYSERVICE_CONTRACTID,
nsProtocolProxyServiceConstructor },
nsProtocolProxyServiceConstructor,
nsnull, nsnull, nsnull,
NS_CI_INTERFACE_GETTER_NAME(nsProtocolProxyService),
nsnull,
&NS_CLASSINFO_NAME(nsProtocolProxyService),
nsIClassInfo::SINGLETON },
// from netwerk/streamconv: