diff --git a/netwerk/base/public/Makefile.in b/netwerk/base/public/Makefile.in index c070786bbfb4..00c00e393310 100644 --- a/netwerk/base/public/Makefile.in +++ b/netwerk/base/public/Makefile.in @@ -77,7 +77,6 @@ XPIDLSRCS = \ nsIPrompt.idl \ nsIProtocolProxyService.idl \ nsIProxiedProtocolHandler.idl \ - nsIProxy.idl \ nsIProxyAutoConfig.idl \ nsIProxyInfo.idl \ nsITransport.idl \ diff --git a/netwerk/base/public/nsIProxy.idl b/netwerk/base/public/nsIProxy.idl deleted file mode 100644 index 8b546adadcdb..000000000000 --- a/netwerk/base/public/nsIProxy.idl +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -/* - The nsIProxy interface allows setting and getting of proxy host and port. - This is for use by protocol handlers. If you are writing a protocol handler - and would like to support proxy behaviour then derive from this as well as - the nsIProtocolHandler class. - - -Gagan Saksena 02/25/99 -*/ - -#include "nsISupports.idl" - -[scriptable, uuid(0492D011-CD2F-11d2-B013-006097BFC036)] -interface nsIProxy : nsISupports -{ - -}; - diff --git a/netwerk/protocol/gopher/src/nsGopherChannel.h b/netwerk/protocol/gopher/src/nsGopherChannel.h index ae80be94c9a5..f2fd788ecd2f 100644 --- a/netwerk/protocol/gopher/src/nsGopherChannel.h +++ b/netwerk/protocol/gopher/src/nsGopherChannel.h @@ -54,7 +54,6 @@ #include "nsIURI.h" #include "nsIURL.h" #include "nsIPrompt.h" -#include "nsIProxy.h" #include "nsIStreamListener.h" #include "nsISocketTransport.h" #include "nsIProgressEventSink.h" diff --git a/netwerk/protocol/http/src/nsHttpHandler.h b/netwerk/protocol/http/src/nsHttpHandler.h index 9a8c1eb71e51..6bbf6538954a 100644 --- a/netwerk/protocol/http/src/nsHttpHandler.h +++ b/netwerk/protocol/http/src/nsHttpHandler.h @@ -56,7 +56,6 @@ #include "nsIObserver.h" #include "nsIObserverService.h" #include "nsIProxyObjectManager.h" -#include "nsIProxy.h" #include "nsIStreamConverterService.h" #include "nsICacheSession.h" #include "nsIEventQueueService.h" diff --git a/netwerk/socket/base/nsISOCKS4SocketInfo.idl b/netwerk/socket/base/nsISOCKS4SocketInfo.idl deleted file mode 100644 index 95af6d0442cb..000000000000 --- a/netwerk/socket/base/nsISOCKS4SocketInfo.idl +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- - * - * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#include "nsIProxy.idl" - -%{C++ -#include "prtypes.h" -#include "prio.h" -%} - -[ptr] native prNetAddr(PRNetAddr); - -[noscript, uuid(35B34E33-5756-4742-893A-D45D49A11942)] -interface nsISOCKS4SocketInfo : nsIProxy { - - attribute prNetAddr destinationAddr; - attribute prNetAddr externalProxyAddr; - attribute prNetAddr internalProxyAddr; -}; diff --git a/netwerk/socket/base/nsISOCKSSocketInfo.idl b/netwerk/socket/base/nsISOCKSSocketInfo.idl index 600d251f28eb..8eca1f3c5ca2 100644 --- a/netwerk/socket/base/nsISOCKSSocketInfo.idl +++ b/netwerk/socket/base/nsISOCKSSocketInfo.idl @@ -37,19 +37,14 @@ * * ***** END LICENSE BLOCK ***** */ -#include "nsIProxy.idl" +#include "nsISupports.idl" -%{C++ -#include "prtypes.h" -#include "prio.h" -%} - -[ptr] native prNetAddr(PRNetAddr); +[ptr] native PRNetAddrPtr(union PRNetAddr); [noscript, uuid(8f755c44-1dd2-11b2-a613-91117453fa95)] -interface nsISOCKSSocketInfo : nsIProxy { - - attribute prNetAddr destinationAddr; - attribute prNetAddr externalProxyAddr; - attribute prNetAddr internalProxyAddr; +interface nsISOCKSSocketInfo : nsISupports +{ + attribute PRNetAddrPtr destinationAddr; + attribute PRNetAddrPtr externalProxyAddr; + attribute PRNetAddrPtr internalProxyAddr; };