W3C home > Mailing lists > Public > www-lib@w3.org > January to March 1997

diffs for w3c-libwww-5.0a.tar.gz

From: Steffen Zahn <zahn@berlin.snafu.de>
Date: Thu, 6 Mar 1997 06:34:46 +0100
Message-Id: <199703060534.GAA03161@zahn.berlin.snafu.de>
To: www-lib@w3.org
Hello,

I just wanted to share the diffs I have collected so far for
w3c-libwww-5.0a.tar.gz
The majority of the diffs are from the amaya sources and should already
be known.

Regards
  Steffen

__________________________ lib diffs _________________________________
diff -urN -x config.cache -x config.log -x config.status -x Makefile -x stamp-h -x config.h -x *.o -x *~ /home/sz/tmp/arena/orig/w3c-libwww-5.0a/Library/src/HTAlert.c /home/sz/tmp/arena/w3c-libwww-5.0a/Library/src/HTAlert.c
--- /home/sz/tmp/arena/orig/w3c-libwww-5.0a/Library/src/HTAlert.c	Wed May  1 01:31:14 1996
+++ /home/sz/tmp/arena/w3c-libwww-5.0a/Library/src/HTAlert.c	Wed Jan 22 15:01:49 1997
@@ -3,7 +3,7 @@
 **
 **	(c) COPYRIGHT MIT 1995.
 **	Please first read the full copyright statement in the file COPYRIGH.
-**	@(#) $Id: HTAlert.c,v 2.50 1996/04/12 17:45:41 frystyk Exp $
+**	@(#) $Id: HTAlert.c,v 1.2 1997/01/20 22:13:27 cvs Exp $
 **
 **	REPLACE THIS MODULE with a GUI version in a GUI environment!
 **
@@ -102,15 +102,16 @@
 */
 PUBLIC BOOL HTAlertCall_deleteAll (HTList * list)
 {
+  /* JK: 20/Jan/96 ... fixed a serious bug here, which caused memory to be freed
+     twice */
+
     if (CORE_TRACE) 
 	HTTrace("Call delete All callback functions\n");
     if (list) {
 	HTList *cur = list;
 	HTAlert *pres;
-	while ((pres = (HTAlert *) HTList_nextObject(cur))) {
-	    HTList_removeObject(list, (void *) pres);
-	    HT_FREE(pres);
-	}
+	while ((pres = (HTAlert *) HTList_nextObject(cur))) 
+	  HT_FREE (pres);
 	HTList_delete(list);
 	return YES;
     }
diff -urN -x config.cache -x config.log -x config.status -x Makefile -x stamp-h -x config.h -x *.o -x *~ /home/sz/tmp/arena/orig/w3c-libwww-5.0a/Library/src/HTAssoc.c /home/sz/tmp/arena/w3c-libwww-5.0a/Library/src/HTAssoc.c
--- /home/sz/tmp/arena/orig/w3c-libwww-5.0a/Library/src/HTAssoc.c	Mon Oct  7 17:04:21 1996
+++ /home/sz/tmp/arena/w3c-libwww-5.0a/Library/src/HTAssoc.c	Fri Feb 21 19:42:09 1997
@@ -112,6 +112,7 @@
 		HTList_removeObject(list, assoc);
 		HT_FREE(assoc);
 		found = YES;
+                break;
 	    }
 	}
     }
diff -urN -x config.cache -x config.log -x config.status -x Makefile -x stamp-h -x config.h -x *.o -x *~ /home/sz/tmp/arena/orig/w3c-libwww-5.0a/Library/src/HTCache.c /home/sz/tmp/arena/w3c-libwww-5.0a/Library/src/HTCache.c
--- /home/sz/tmp/arena/orig/w3c-libwww-5.0a/Library/src/HTCache.c	Fri Oct 11 00:45:20 1996
+++ /home/sz/tmp/arena/w3c-libwww-5.0a/Library/src/HTCache.c	Wed Mar  5 20:31:08 1997
@@ -3,7 +3,7 @@
 **
 **	(c) COPYRIGHT MIT 1995.
 **	Please first read the full copyright statement in the file COPYRIGH.
-**	@(#) $Id: HTCache.c,v 2.27 1996/10/10 22:33:52 frystyk Exp $
+**	@(#) $Id: HTCache.c,v 1.2 1997/01/22 12:12:49 cvs Exp $
 **
 **	This modules manages the cache
 **
@@ -320,13 +320,13 @@
 	if (sscanf(line, "%ld %ld %c %d %d %ld %ld %ld %c",
 		   &cache->expires,
 		   &cache->size,
-		   &cache->range,
+		   &range,
 		   &cache->hash,
 		   &cache->hits,
 		   &cache->freshness_lifetime,
 		   &cache->response_time,
 		   &cache->corrected_initial_age,
-		   &validate) < 0) {
+		   &validate) != 9) {
 	    if (CACHE_TRACE) HTTrace("Cache Index. Error reading cache index\n");
 	    return NO;
 	}
diff -urN -x config.cache -x config.log -x config.status -x Makefile -x stamp-h -x config.h -x *.o -x *~ /home/sz/tmp/arena/orig/w3c-libwww-5.0a/Library/src/HTDNS.h /home/sz/tmp/arena/w3c-libwww-5.0a/Library/src/HTDNS.h
--- /home/sz/tmp/arena/orig/w3c-libwww-5.0a/Library/src/HTDNS.h	Tue Sep 10 03:04:33 1996
+++ /home/sz/tmp/arena/w3c-libwww-5.0a/Library/src/HTDNS.h	Wed Mar  5 20:31:48 1997
@@ -26,6 +26,8 @@
 #ifndef HTDNS_H
 #define HTDNS_H
 
+#include <netdb.h>
+
 /*
 
  */
diff -urN -x config.cache -x config.log -x config.status -x Makefile -x stamp-h -x config.h -x *.o -x *~ /home/sz/tmp/arena/orig/w3c-libwww-5.0a/Library/src/HTEvntrg.c /home/sz/tmp/arena/w3c-libwww-5.0a/Library/src/HTEvntrg.c
--- /home/sz/tmp/arena/orig/w3c-libwww-5.0a/Library/src/HTEvntrg.c	Thu Sep 26 23:00:07 1996
+++ /home/sz/tmp/arena/w3c-libwww-5.0a/Library/src/HTEvntrg.c	Wed Jan 22 15:01:49 1997
@@ -3,7 +3,7 @@
 **
 **	(c) COPYRIGHT MIT 1995.
 **	Please first read the full copyright statement in the file COPYRIGH.
-**	@(#) $Id: HTEvntrg.c,v 2.46 1996/09/16 21:33:45 eric Exp $
+**	@(#) $Id: HTEvntrg.c,v 1.3 1997/01/16 10:53:23 cvs Exp $
 **
 **	Updated HTEvent module 
 **	This new module combines the functions of the old HTEvent module and 
@@ -366,6 +366,12 @@
     RQ * rqp = 0 , **rqpp = 0 ;
     long v = HASH(s);
     BOOL found = NO;
+
+    /* DV: 17/Jan/97 added a protection to avoid a memory overrun while
+       trying to add an invalid socket */
+    if (s == INVSOC)
+	return 0; /* we can't find an INVSOC */
+
     for (rqpp = &table[v]; (rqp = *rqpp) != 0 ; rqpp = &rqp->next) {
         if (rqp->s == s) {
             __RequestUpdate( rqp, s, rq, ops, cbf, p) ;
@@ -436,6 +442,11 @@
     RQ * rqp = 0, **rqpp = 0;
     int found = 0;
 
+    /* JK: 16/Jan/97 added a protection to avoid a memory overrun while
+       trying to unregister an invalid socket */
+    if (s == INVSOC)
+	return 0; /* we can't find an INVSOC */
+
     for (rqpp = &table[v]; (rqp = *rqpp) != 0 ; rqpp = &rqp->next) {
         if (rqp -> s == s ) { 
             found = 1 ;
@@ -459,11 +470,19 @@
 ** and return the HTRequest pointer associated with it.
 ** If the socket isn't found, the function returns NULL
 */
-PRIVATE HTEventCallback *__RetrieveCBF(SOCKET s, SockOps ops,HTRequest **arp)
+
+/* JK: 15/oct/96: Made this function public */
+
+PUBLIC HTEventCallback *__RetrieveCBF(SOCKET s, SockOps ops,HTRequest **arp)
 {
     long value = HASH(s);
     register RQ * rqp = 0, **rqpp = 0 ;
     BOOL found = NO;
+
+    /* DV: 17/Jan/97 added a protection to avoid a memory overrun while
+       trying to get the callback on an invalid socket */
+    if (s == INVSOC)
+	return NULL; /* we can't find an INVSOC */
 
     *arp = 0 ;	  /* just too be sure */
 
diff -urN -x config.cache -x config.log -x config.status -x Makefile -x stamp-h -x config.h -x *.o -x *~ /home/sz/tmp/arena/orig/w3c-libwww-5.0a/Library/src/HTEvntrg.h /home/sz/tmp/arena/w3c-libwww-5.0a/Library/src/HTEvntrg.h
--- /home/sz/tmp/arena/orig/w3c-libwww-5.0a/Library/src/HTEvntrg.h	Tue Sep 10 03:04:38 1996
+++ /home/sz/tmp/arena/w3c-libwww-5.0a/Library/src/HTEvntrg.h	Wed Jan 22 15:01:48 1997
@@ -152,15 +152,26 @@
    
  */
 extern void HTEventrg_stopLoop (void);
+
+
 /*
+** __RetrieveCBF
+** given a socket, return the HTEventCallback function registered for it
+** and return the HTRequest pointer associated with it.
+** If the socket isn't found, the function returns NULL
+*/
+
+/* JK: 15/oct/96: Made this function public */
+
+extern HTEventCallback *__RetrieveCBF(SOCKET s, SockOps ops,HTRequest **arp);
+
 
- */
 #endif /* HTEVENTRG_H */
 /*
 
    
    ___________________________________
    
-                             @(#) $Id: HTEvntrg.html,v 2.24 1996/09/09 18:53:30 eric Exp $
+                             @(#) $Id: HTEvntrg.h,v 1.3 1996/10/15 13:40:32 cvs Exp $
                                                                                           
     */
diff -urN -x config.cache -x config.log -x config.status -x Makefile -x stamp-h -x config.h -x *.o -x *~ /home/sz/tmp/arena/orig/w3c-libwww-5.0a/Library/src/HTReqMan.c /home/sz/tmp/arena/w3c-libwww-5.0a/Library/src/HTReqMan.c
--- /home/sz/tmp/arena/orig/w3c-libwww-5.0a/Library/src/HTReqMan.c	Fri Oct 11 00:45:55 1996
+++ /home/sz/tmp/arena/w3c-libwww-5.0a/Library/src/HTReqMan.c	Wed Feb  5 18:58:08 1997
@@ -3,7 +3,7 @@
 **
 **	(c) COPYRIGHT MIT 1995.
 **	Please first read the full copyright statement in the file COPYRIGH.
-**	@(#) $Id: HTReqMan.c,v 2.60 1996/10/10 22:35:56 frystyk Exp $
+**	@(#) $Id: HTReqMan.c,v 1.2 1997/02/01 04:53:58 cvs Exp $
 **
 ** Authors
 **	TBL	Tim Berners-Lee timbl@w3.org
@@ -86,6 +86,10 @@
 
     /* Content negotiation */
     me->ContentNegotiation = YES;		       /* Do this by default */
+
+    /* Conversions local to the request */
+    /* (added by JK 31/01/97) */
+    me->conversions = (HTList *) NULL;
 
     if (CORE_TRACE) HTTrace("Request..... Created %p\n", me);
 
diff -urN -x config.cache -x config.log -x config.status -x Makefile -x stamp-h -x config.h -x *.o -x *~ /home/sz/tmp/arena/orig/w3c-libwww-5.0a/Library/src/HTTPReq.c /home/sz/tmp/arena/w3c-libwww-5.0a/Library/src/HTTPReq.c
--- /home/sz/tmp/arena/orig/w3c-libwww-5.0a/Library/src/HTTPReq.c	Mon Oct  7 17:04:40 1996
+++ /home/sz/tmp/arena/w3c-libwww-5.0a/Library/src/HTTPReq.c	Wed Feb  5 18:58:09 1997
@@ -3,7 +3,7 @@
 **
 **	(c) COPYRIGHT MIT 1995.
 **	Please first read the full copyright statement in the file COPYRIGH.
-**	@(#) $Id: HTTPReq.c,v 2.45 1996/10/07 02:05:26 frystyk Exp $
+**	@(#) $Id: HTTPReq.c,v 1.2 1997/02/01 04:53:58 cvs Exp $
 **
 **	This module implements the output stream for HTTP used for sending
 **	requests with or without a entity body.
@@ -169,8 +169,11 @@
 	** If caller has specified a specific output format then use this.
 	** Otherwise use all the registered converters to generate the 
 	** accept header
+        ** JK: 31/01/97: Added an additional condition to the if, to be
+        **                able to generate user defined accept headers
 	*/
-	if (HTRequest_outputFormat(request) == WWW_PRESENT) {
+	if (HTRequest_outputFormat(request) == WWW_PRESENT ||
+            HTRequest_conversion(request) != (HTList *) NULL) {
 	    int list;
 	    HTList *cur;
 	    BOOL first=YES;
______________________________________________________________________

-- 
work: Steffen.Zahn%robinie@tmn.sie.siemens.at | home: zahn@berlin.snafu.de
Any opinions expressed herein are not necessarily those of my employer.
Use of my addresses for unsolicited commercial advertising is forbidden.
Received on Thursday, 6 March 1997 00:33:12 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Monday, 23 April 2007 18:18:27 GMT