summaryrefslogtreecommitdiff
path: root/www/mozilla/patches
diff options
context:
space:
mode:
Diffstat (limited to 'www/mozilla/patches')
-rw-r--r--www/mozilla/patches/patch-au4
-rw-r--r--www/mozilla/patches/patch-aw4
-rw-r--r--www/mozilla/patches/patch-ax126
-rw-r--r--www/mozilla/patches/patch-ay21
-rw-r--r--www/mozilla/patches/patch-az4
-rw-r--r--www/mozilla/patches/patch-ba4
-rw-r--r--www/mozilla/patches/patch-bb4
-rw-r--r--www/mozilla/patches/patch-bc6
-rw-r--r--www/mozilla/patches/patch-bd27
9 files changed, 117 insertions, 83 deletions
diff --git a/www/mozilla/patches/patch-au b/www/mozilla/patches/patch-au
index bb8d1174e67..a0e75a1f146 100644
--- a/www/mozilla/patches/patch-au
+++ b/www/mozilla/patches/patch-au
@@ -1,8 +1,8 @@
-$NetBSD: patch-au,v 1.5 2001/09/16 14:03:08 taya Exp $
+$NetBSD: patch-au,v 1.6 2001/10/16 15:52:09 taya Exp $
diff -ru ../Orig/mozilla/security/coreconf/NetBSD.mk ./security/coreconf/NetBSD.mk
--- ../Orig/mozilla/security/coreconf/NetBSD.mk Sat Sep 30 02:42:36 2000
-+++ ./security/coreconf/NetBSD.mk Sun Sep 16 20:47:00 2001
++++ ./security/coreconf/NetBSD.mk Sat Oct 13 19:56:43 2001
@@ -40,8 +40,13 @@
CCC = g++
RANLIB = ranlib
diff --git a/www/mozilla/patches/patch-aw b/www/mozilla/patches/patch-aw
index e4e7e74296e..09d6f49282d 100644
--- a/www/mozilla/patches/patch-aw
+++ b/www/mozilla/patches/patch-aw
@@ -1,8 +1,8 @@
-$NetBSD: patch-aw,v 1.4 2001/09/16 14:03:08 taya Exp $
+$NetBSD: patch-aw,v 1.5 2001/10/16 15:52:09 taya Exp $
diff -ru ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in ./widget/src/gtksuperwin/Makefile.in
--- ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in Sun Apr 29 04:46:11 2001
-+++ ./widget/src/gtksuperwin/Makefile.in Sun Sep 16 20:47:03 2001
++++ ./widget/src/gtksuperwin/Makefile.in Sat Oct 13 19:56:53 2001
@@ -25,6 +25,7 @@
MODULE = widget
LIBRARY_NAME = gtksuperwin
diff --git a/www/mozilla/patches/patch-ax b/www/mozilla/patches/patch-ax
index d77a7cdd716..f9f867e7173 100644
--- a/www/mozilla/patches/patch-ax
+++ b/www/mozilla/patches/patch-ax
@@ -1,82 +1,89 @@
-$NetBSD: patch-ax,v 1.3 2001/09/16 14:03:08 taya Exp $
+$NetBSD: patch-ax,v 1.4 2001/10/16 15:52:09 taya Exp $
diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/src/nsSocketTransport.cpp
---- ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp Wed Aug 22 09:24:26 2001
-+++ ./netwerk/base/src/nsSocketTransport.cpp Sun Sep 16 20:47:05 2001
-@@ -170,8 +170,7 @@
+--- ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp Sat Sep 29 17:27:36 2001
++++ ./netwerk/base/src/nsSocketTransport.cpp Sat Oct 13 19:56:58 2001
+@@ -187,8 +187,7 @@
//
// Set up Internet defaults...
//
- memset(&mNetAddress, 0, sizeof(mNetAddress));
- PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, 0, &mNetAddress);
-+ mNetAddressList = NULL;
++ mNetAddressList = nsnull;
//
// Initialize the global connect timeout value if necessary...
-@@ -220,6 +219,13 @@
+@@ -237,6 +236,13 @@
nsAutoMonitor::DestroyMonitor(mMonitor);
mMonitor = nsnull;
}
+
-+ PRNetAddrList *p, *next;;
-+ for(p = mNetAddressList; p; ){
-+ next = p->next;
-+ delete p;
-+ p = next;
++ nsNetAddrList *p, *next;
++ for (p = mNetAddressList; p; ){
++ next = p->next;
++ delete p;
++ p = next;
+ }
}
-@@ -604,14 +610,13 @@
+@@ -641,15 +647,7 @@
//
// The hostname has not been resolved yet...
//
- if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) {
-+ if (mNetAddressList == NULL) {
- //
- // Initialize the port used for the connection...
- //
- // XXX: The list of ports must be restricted - see net_bad_ports_table[] in
- // mozilla/network/main/mkconect.c
- //
+- //
+- // Initialize the port used for the connection...
+- //
+- // XXX: The list of ports must be restricted - see net_bad_ports_table[] in
+- // mozilla/network/main/mkconect.c
+- //
- mNetAddress.ipv6.port = PR_htons(((mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort));
-
+-
++ if (mNetAddressList == nsnull) {
nsCOMPtr<nsIDNSService> pDNSService(do_GetService(kDNSService, &rv));
if (NS_FAILED(rv)) return rv;
-@@ -635,7 +640,7 @@
+
+@@ -672,7 +670,7 @@
//
// The DNS lookup has finished... It has either failed or succeeded.
//
- if (NS_FAILED(mStatus) || !PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) {
-+ if (NS_FAILED(mStatus) || mNetAddressList != NULL) {
++ if (NS_FAILED(mStatus) || mNetAddressList) {
mDNSRequest = 0;
rv = mStatus;
}
-@@ -795,7 +800,8 @@
+@@ -832,7 +830,8 @@
// This is only done the first time doConnection(...) is called.
//
if (NS_SUCCEEDED(rv)) {
- status = PR_Connect(mSocketFD, &mNetAddress, gConnectTimeout);
+try_again:
-+ status = PR_Connect(mSocketFD, &(mNetAddressp->mNetAddress), gConnectTimeout);
++ status = PR_Connect(mSocketFD, &(mNetAddressList->addr), gConnectTimeout);
if (PR_SUCCESS != status) {
PRErrorCode code = PR_GetError();
//
-@@ -820,6 +826,9 @@
+@@ -857,6 +856,12 @@
//
else {
// Connection refused...
-+ if((mNetAddressp = mNetAddressp->next)){
++ nsNetAddrList *p = mNetAddressList;
++ mNetAddressList = mNetAddressList->next;
++ delete p;
++ if (mNetAddressList){
+ goto try_again;
+ }
LOG(("nsSocketTransport: Connection Refused [%s:%d %x]. PRErrorCode = %x\n",
mHostName, mPort, this, code));
rv = NS_ERROR_CONNECTION_REFUSED;
-@@ -833,11 +842,17 @@
+@@ -870,11 +875,23 @@
//
else if (aSelectFlags) {
if (PR_POLL_EXCEPT & aSelectFlags) {
-+ if((mNetAddressp = mNetAddressp->next)){
++ nsNetAddrList *p = mNetAddressList;
++ mNetAddressList = mNetAddressList->next;
++ delete p;
++ if (mNetAddressList){
+ goto try_again;
+ }
LOG(("nsSocketTransport: Connection Refused via PR_POLL_EXCEPT. [%s:%d %x].\n",
@@ -84,63 +91,65 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
rv = NS_ERROR_CONNECTION_REFUSED;
}
else if (PR_POLL_HUP & aSelectFlags) {
-+ if((mNetAddressp = mNetAddressp->next)){
-+ goto try_again;
-+ }
++ nsNetAddrList *p = mNetAddressList;
++ mNetAddressList = mNetAddressList->next;
++ delete p;
++ if (mNetAddressList){
++ goto try_again;
++ }
LOG(("nsSocketTransport: Connection Refused via PR_POLL_HUP. [%s:%d %x].\n",
mHostName, mPort, this));
rv = NS_ERROR_CONNECTION_REFUSED;
-@@ -880,7 +895,7 @@
+@@ -917,7 +934,7 @@
//
// The hostname has not been resolved yet...
//
- if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) {
-+ if (mNetAddressList == NULL) {
++ if (mNetAddressList == nsnull) {
nsCOMPtr<nsIDNSService> pDNSService(do_GetService(kDNSService, &rv));
if (NS_FAILED(rv)) return rv;
-@@ -899,16 +914,19 @@
+@@ -936,16 +953,18 @@
return NS_ERROR_FAILURE;
}
-+/****************/
-+ mNetAddressList = new PRNetAddrList;
-+ mNetAddressList->next = NULL;
++ mNetAddressList = new nsNetAddrList;
++ mNetAddressList->next = nsnull;
if (addr.raw.family == PR_AF_INET)
- PR_ConvertIPv4AddrToIPv6(addr.inet.ip, &mNetAddress.ipv6.ip);
-+ PR_ConvertIPv4AddrToIPv6(addr.inet.ip, &(mNetAddressList->mNetAddress.ipv6.ip));
++ PR_ConvertIPv4AddrToIPv6(addr.inet.ip, &(mNetAddressList->addr.ipv6.ip));
else
- memcpy(&mNetAddress.ipv6.ip, &addr.ipv6.ip, sizeof(mNetAddress.ipv6.ip));
-+ memcpy(&(mNetAddressList->mNetAddress.ipv6.ip), &addr.ipv6.ip, sizeof(mNetAddressList->mNetAddress.ipv6.ip));
++ memcpy(&(mNetAddressList->addr.ipv6.ip), &addr.ipv6.ip, sizeof(mNetAddressList->addr.ipv6.ip));
- mNetAddress.ipv6.port
-+ mNetAddressList->mNetAddress.ipv6.port
++ mNetAddressList->addr.ipv6.port
= PR_htons(((mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort));
LOG(("address { family=%hu, port=%hu }\n",
- mNetAddress.ipv6.family, PR_ntohs(mNetAddress.ipv6.port)));
-+ mNetAddressList->mNetAddress.ipv6.family, PR_ntohs(mNetAddressList->mNetAddress.ipv6.port)));
++ mNetAddressList->addr.ipv6.family, PR_ntohs(mNetAddressList->addr.ipv6.port)));
}
//
-@@ -1373,21 +1391,28 @@
+@@ -1410,21 +1429,27 @@
// Enter the socket transport lock...
nsAutoMonitor mon(mMonitor);
nsresult rv = NS_OK;
+ char **p;
-+ PRNetAddrList **addrp = &mNetAddressList;
++ nsNetAddrList **addrp = &mNetAddressList;
if (aHostEnt->hostEnt.h_addr_list && aHostEnt->hostEnt.h_addr_list[0]) {
- if (aHostEnt->hostEnt.h_addrtype == PR_AF_INET6)
- memcpy(&mNetAddress.ipv6.ip, aHostEnt->hostEnt.h_addr_list[0], sizeof(mNetAddress.ipv6.ip));
- else
- PR_ConvertIPv4AddrToIPv6(*(PRUint32*)aHostEnt->hostEnt.h_addr_list[0], &mNetAddress.ipv6.ip);
-+ for(p = aHostEnt->hostEnt.h_addr_list; *p; p++){
-+ *addrp = new PRNetAddrList;
-+ (*addrp)->next = NULL;
-+ (*addrp)->mNetAddress.ipv6.port = PR_htons(((mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort));
-+ (*addrp)->mNetAddress.raw.family = PR_AF_INET6;
-+ memcpy(&((*addrp)->mNetAddress.ipv6.ip), *p, sizeof((*addrp)->mNetAddress.ipv6.ip));
++ for (p = aHostEnt->hostEnt.h_addr_list; *p; p++){
++ *addrp = new nsNetAddrList;
++ (*addrp)->next = nsnull;
++ (*addrp)->addr.ipv6.port = PR_htons(((mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort));
++ (*addrp)->addr.raw.family = PR_AF_INET6;
++ memcpy(&((*addrp)->addr.ipv6.ip), *p, sizeof((*addrp)->addr.ipv6.ip));
#if defined(PR_LOGGING)
- char addrbuf[50];
- PR_NetAddrToString(&mNetAddress, addrbuf, sizeof(addrbuf));
@@ -149,35 +158,34 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
- mHostName, mPort, this,
- aHostEnt->hostEnt.h_name,
- addrbuf));
-+ char addrbuf[50];
-+ PR_NetAddrToString(&((*addrp)->mNetAddress), addrbuf, sizeof(addrbuf));
-+ LOG(("nsSocketTransport: OnFound(...) [%s:%d %x]."
++ char addrbuf[50];
++ PR_NetAddrToString(&((*addrp)->addr), addrbuf, sizeof(addrbuf));
++ LOG(("nsSocketTransport: OnFound(...) [%s:%d %x]."
+ " DNS lookup succeeded => %s (%s)\n",
+ mHostName, mPort, this,
+ aHostEnt->hostEnt.h_name,
+ addrbuf));
#endif
-+ addrp = &((*addrp)->next);
-+ }
-+ mNetAddressp = mNetAddressList;
++ addrp = &((*addrp)->next);
++ }
} else {
// XXX: What should happen here? The GetHostByName(...) succeeded but
// there are *no* A records...
-@@ -1420,7 +1445,7 @@
+@@ -1457,7 +1482,7 @@
// If the lookup failed, set the status...
if (NS_FAILED(aStatus))
mStatus = aStatus;
- else if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny))
-+ else if (mNetAddressList == NULL)
++ else if (mNetAddressList == nsnull)
mStatus = NS_ERROR_ABORT;
// Start processing the transport again - if necessary...
-@@ -1741,7 +1766,7 @@
+@@ -1778,7 +1803,7 @@
*_retval = (char*)nsMemory::Alloc(aLen);
if (!*_retval) return NS_ERROR_FAILURE;
- PRStatus status = PR_NetAddrToString(&mNetAddress, *_retval, aLen);
-+ PRStatus status = PR_NetAddrToString(&mNetAddressList->mNetAddress, *_retval, aLen);
++ PRStatus status = PR_NetAddrToString(&mNetAddressList->addr, *_retval, aLen);
if (PR_FAILURE == status) {
nsMemory::Free(*_retval);
diff --git a/www/mozilla/patches/patch-ay b/www/mozilla/patches/patch-ay
index 2947e793caa..a8253661642 100644
--- a/www/mozilla/patches/patch-ay
+++ b/www/mozilla/patches/patch-ay
@@ -1,27 +1,26 @@
-$NetBSD: patch-ay,v 1.3 2001/09/16 14:03:09 taya Exp $
+$NetBSD: patch-ay,v 1.4 2001/10/16 15:52:09 taya Exp $
diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.h ./netwerk/base/src/nsSocketTransport.h
---- ../Orig/mozilla/netwerk/base/src/nsSocketTransport.h Sat May 12 06:03:21 2001
-+++ ./netwerk/base/src/nsSocketTransport.h Sun Sep 16 20:47:10 2001
-@@ -107,6 +107,11 @@
+--- ../Orig/mozilla/netwerk/base/src/nsSocketTransport.h Sat Sep 29 05:09:03 2001
++++ ./netwerk/base/src/nsSocketTransport.h Sat Oct 13 19:56:59 2001
+@@ -123,6 +123,11 @@
eSocketDNS_Wait = 0x2020
};
-+typedef struct PRNetAddrList{
-+ PRNetAddr mNetAddress;
-+ struct PRNetAddrList *next;
-+} PRNetAddrList;
++struct nsNetAddrList {
++ PRNetAddr addr;
++ struct nsNetAddrList *next;
++};
+
//
// This is the default timeout value (in milliseconds) for sockets which have
// no activity...
-@@ -231,7 +236,8 @@
+@@ -246,7 +251,7 @@
PRIntervalTime mLastActiveTime;
PRCList mListLink;
PRMonitor* mMonitor;
- PRNetAddr mNetAddress;
-+ PRNetAddrList *mNetAddressList;
-+ PRNetAddrList *mNetAddressp;
++ nsNetAddrList *mNetAddressList;
nsSocketOperation mOperation;
nsCOMPtr<nsISupports> mSecurityInfo;
diff --git a/www/mozilla/patches/patch-az b/www/mozilla/patches/patch-az
index 8bbece36dad..354dde0057e 100644
--- a/www/mozilla/patches/patch-az
+++ b/www/mozilla/patches/patch-az
@@ -1,8 +1,8 @@
-$NetBSD: patch-az,v 1.2 2001/09/16 14:03:09 taya Exp $
+$NetBSD: patch-az,v 1.3 2001/10/16 15:52:10 taya Exp $
diff -ru ../Orig/mozilla/directory/c-sdk/ldap/include/portable.h ./directory/c-sdk/ldap/include/portable.h
--- ../Orig/mozilla/directory/c-sdk/ldap/include/portable.h Wed Aug 15 16:14:54 2001
-+++ ./directory/c-sdk/ldap/include/portable.h Sun Sep 16 20:47:15 2001
++++ ./directory/c-sdk/ldap/include/portable.h Sat Oct 13 19:57:01 2001
@@ -98,7 +98,7 @@
* some systems don't have the BSD re_comp and re_exec routines
*/
diff --git a/www/mozilla/patches/patch-ba b/www/mozilla/patches/patch-ba
index 9419c7d9a07..d2c420c07e6 100644
--- a/www/mozilla/patches/patch-ba
+++ b/www/mozilla/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.1 2001/09/16 14:03:09 taya Exp $
+$NetBSD: patch-ba,v 1.2 2001/10/16 15:52:10 taya Exp $
diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg
--- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg Sat Dec 2 06:29:17 2000
-+++ ./nsprpub/pr/include/md/_netbsd.cfg Sun Sep 16 20:47:23 2001
++++ ./nsprpub/pr/include/md/_netbsd.cfg Sat Oct 13 19:57:09 2001
@@ -91,6 +91,52 @@
#define PR_ALIGN_OF_DOUBLE 4
#define PR_ALIGN_OF_POINTER 4
diff --git a/www/mozilla/patches/patch-bb b/www/mozilla/patches/patch-bb
index db98aa49999..42b8fa3df3d 100644
--- a/www/mozilla/patches/patch-bb
+++ b/www/mozilla/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.1 2001/09/16 14:03:09 taya Exp $
+$NetBSD: patch-bb,v 1.2 2001/10/16 15:52:10 taya Exp $
diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md/_netbsd.h
--- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h Fri Dec 29 02:04:04 2000
-+++ ./nsprpub/pr/include/md/_netbsd.h Sun Sep 16 20:47:26 2001
++++ ./nsprpub/pr/include/md/_netbsd.h Sat Oct 13 19:57:11 2001
@@ -48,6 +48,8 @@
#define _PR_SI_ARCHITECTURE "m68k"
#elif defined(__powerpc__)
diff --git a/www/mozilla/patches/patch-bc b/www/mozilla/patches/patch-bc
index 6ca14fabbd9..2900d79e20d 100644
--- a/www/mozilla/patches/patch-bc
+++ b/www/mozilla/patches/patch-bc
@@ -1,8 +1,8 @@
-$NetBSD: patch-bc,v 1.1 2001/09/16 14:03:10 taya Exp $
+$NetBSD: patch-bc,v 1.2 2001/10/16 15:52:10 taya Exp $
diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/reflect/xptcall/src/md/unix/Makefile.in
---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in Tue Jun 19 07:10:25 2001
-+++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Sep 16 20:47:28 2001
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in Thu Sep 6 17:23:09 2001
++++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in Sat Oct 13 19:57:23 2001
@@ -235,6 +235,13 @@
CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
diff --git a/www/mozilla/patches/patch-bd b/www/mozilla/patches/patch-bd
new file mode 100644
index 00000000000..06bfaf67d62
--- /dev/null
+++ b/www/mozilla/patches/patch-bd
@@ -0,0 +1,27 @@
+$NetBSD: patch-bd,v 1.1 2001/10/16 15:52:10 taya Exp $
+
+diff -ru ../Orig/mozilla/netwerk/base/public/nsNetUtil.h ./netwerk/base/public/nsNetUtil.h
+--- ../Orig/mozilla/netwerk/base/public/nsNetUtil.h Sat Sep 29 05:08:56 2001
++++ ./netwerk/base/public/nsNetUtil.h Sat Oct 13 20:33:47 2001
+@@ -604,8 +604,8 @@
+ PRUint32 aOffset=0,
+ PRUint32 aCount=0,
+ PRUint32 aFlags=0,
+- nsIRequestObserver *aObserver=NULL,
+- nsISupports *aContext=NULL)
++ nsIRequestObserver *aObserver=(nsIRequestObserver *)NULL,
++ nsISupports *aContext=(nsISupports *)NULL)
+ {
+ NS_ENSURE_ARG_POINTER(aTransport);
+
+@@ -646,8 +646,8 @@
+ PRUint32 aOffset=0,
+ PRUint32 aCount=0,
+ PRUint32 aFlags=0,
+- nsIRequestObserver *aObserver=NULL,
+- nsISupports *aContext=NULL)
++ nsIRequestObserver *aObserver=(nsIRequestObserver *)NULL,
++ nsISupports *aContext=(nsISupports *)NULL)
+ {
+ NS_ENSURE_ARG_POINTER(aTransport);
+
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 07:24:36 +0000