Commit of old modified sources from last September.

Detail:
  Added knowledge of OPTIONS and TRACE to the option decoder.
  Now knows about new SWI names of AcornSSL module.
Admin:
  Tested briefly.
  Requires AcornSSL-0_08 header export to have occurred.

Version 0.85. Tagged as 'HTTP-0_85'

MakeTest

@@ -2,7 +2,7 @@
 
 
 # Toolflags:
-CCflags = -c -depend !Depend -IC: -throwback
+CCflags = -c -depend !Depend -IC:,C:zlib -throwback
 C++flags = -c -depend !Depend -IC: -throwback
 Linkflags = -aif -c++ -o $@
 ObjAsmflags = -throwback -NoCache -depend !Depend

Makefile

@@ -203,10 +203,10 @@ install_rom: ${ROM_MODULE}
 	${CP} ${ROM_MODULE} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
 	@echo ${COMPONENT}: Module installed (ROM)
 
-resources: Resources.${LOCALE}.Messages
+resources: LocalRes:Messages
 	${MKDIR} ${RESDIR}
 	${MKDIR} ${RESDIR}.${COMPONENT}
-	${CP} Resources.${LOCALE}.* ${RESDIR}.${COMPONENT}.* ${CPFLAGS}
+	${CP} LocalRes:* ${RESDIR}.${COMPONENT}.* ${CPFLAGS}
 	@echo ${COMPONENT}: resource files copied to Messages module
 
 clean:
@@ -225,15 +225,12 @@ ${ROM_MODULE}: ${OBJS} ${ROMCSTUBS}
 # final link for ROM Image (using given base address)
 rom_link:
 	${MKDIR} linked
-	${MKDIR} map
-	${LD} -o linked.${COMPONENT} -bin -base ${ADDRESS} ${ROM_MODULE} ${ABSSYM} \
-	      -map > map.${COMPONENT}
-	truncate map.${COMPONENT} linked.${COMPONENT}
+	${LD} -o linked.${COMPONENT} -rmf -base ${ADDRESS} ${ROM_MODULE} ${ABSSYM}
 	${CP} linked.${COMPONENT} ${LINKDIR}.${COMPONENT} ${CPFLAGS}
 	@echo ${COMPONENT}: rom_link complete
 
-${MSGSF}: @.Resources.${LOCALE}.Messages
-	resgen messages_file ${MSGSF} Resources.${LOCALE}.Messages ${RESFSDIR}.Messages
+${MSGSF}: LocalRes:Messages
+	resgen messages_file ${MSGSF} LocalRes:Messages ${RESFSDIR}.Messages
 
 ${RAM_MODULE}: ${RAM_OBJS} ${MSGSF} ${TCPIPLIBS} ${ZLIB} ${CLIB}
 	${mkdir} rm

VersionNum

-/* (0.84)
+/* (0.85)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG     	0.84
+#define Module_MajorVersion_CMHG     	0.85
 #define Module_MinorVersion_CMHG	
-#define Module_Date_CMHG      		16 Sep 1998
+#define Module_Date_CMHG      		15 Feb 1999
 
-#define Module_MajorVersion     	"0.84"
-#define Module_Version                  84
+#define Module_MajorVersion     	"0.85"
+#define Module_Version                  85
 #define Module_MinorVersion		""
-#define Module_Date      		"16 Sep 1998"
+#define Module_Date      		"15 Feb 1999"
 

c/security

@@ -166,7 +166,7 @@ static int sec_socketioctl(int s, unsigned long op, ...)
 	data = va_arg(ap, void *);
         va_end(ap);
 
-        e = _swix(HTTPS_Ioctl, _INR(0,2)|_OUT(0),
+        e = _swix(AcornSSL_Ioctl, _INR(0,2)|_OUT(0),
         	s, op, data, &result);
         if (!e) return result;
         errno = e->errnum;
@@ -178,7 +178,7 @@ static int sec_socket(int domain, int type, int protocol)
         _kernel_oserror *e;
 	int result;
 
-	e = _swix(HTTPS_Socket, _INR(0,2)|_OUT(0),
+	e = _swix(AcornSSL_Socket, _INR(0,2)|_OUT(0),
 		domain, type, protocol,
 		&result);
 	if (!e) return result;
@@ -191,7 +191,7 @@ static int sec_connect(int s, const struct sockaddr *name, int namelen)
         _kernel_oserror *e;
 	int result;
 
-	e = _swix(HTTPS_Connect, _INR(0,2)|_OUT(0),
+	e = _swix(AcornSSL_Connect, _INR(0,2)|_OUT(0),
 		s, name, namelen,
 		&result);
 	if (!e) return result;
@@ -204,7 +204,7 @@ static int sec_shutdown(int s, int how)
         _kernel_oserror *e;
 	int result;
 
-	e = _swix(HTTPS_Shutdown, _INR(0,1)|_OUT(0),
+	e = _swix(AcornSSL_Shutdown, _INR(0,1)|_OUT(0),
 		s, how,
 		&result);
 	if (!e) return result;
@@ -217,7 +217,7 @@ static int sec_socketclose(int d)
         _kernel_oserror *e;
 	int result;
 
-	e = _swix(HTTPS_Close, _IN(0)|_OUT(0),
+	e = _swix(AcornSSL_Close, _IN(0)|_OUT(0),
 		d,
 		&result);
 	if (!e) return result;
@@ -231,7 +231,7 @@ static int sec_getsockopt(int s, int level, int optname,
         _kernel_oserror *e;
 	int result;
 
-	e = _swix(HTTPS_Getsockopt, _INR(0,4)|_OUT(0),
+	e = _swix(AcornSSL_Getsockopt, _INR(0,4)|_OUT(0),
 		s, level, optname, optval, optlen,
 		&result);
 	if (!e) return result;
@@ -244,7 +244,7 @@ static int sec_socketwrite(int s, const void *buf, unsigned int len)
         _kernel_oserror *e;
 	int result;
 
-	e = _swix(HTTPS_Write, _INR(0,2)|_OUT(0),
+	e = _swix(AcornSSL_Write, _INR(0,2)|_OUT(0),
 		s, buf, len,
 		&result);
 	if (!e) return result;
@@ -257,7 +257,7 @@ static int sec_recv(int s, void *data, size_t size, int flags)
         _kernel_oserror *e;
 	int result;
 
-	e = _swix(HTTPS_Recv, _INR(0,3)|_OUT(0),
+	e = _swix(AcornSSL_Recv, _INR(0,3)|_OUT(0),
 		s, data, size, flags,
 		&result);
 	if (!e) return result;

c/start

@@ -384,6 +384,9 @@ static const char *http_method_text(const int method)
 		case method_HTTP_HEAD: return "HEAD";
 		case method_HTTP_POST: return "POST";
 		case method_HTTP_PUT:  return "PUT";
+		case method_HTTP_OPTIONS:  return "OPTIONS";
+		case method_HTTP_TRACE:  return "TRACE";
+		case method_HTTP_DELETE:  return "DELETE";
 		default:
 			return NULL;
 	}

h/protocol

@@ -90,8 +90,11 @@ typedef enum {
 typedef enum {
         method_HTTP_GET 	= 1,
         method_HTTP_HEAD 	= 2,
+        method_HTTP_OPTIONS     = 3,
         method_HTTP_POST	= 4,
-        method_HTTP_PUT		= 8
+        method_HTTP_TRACE       = 5,
+        method_HTTP_PUT		= 8,
+        method_HTTP_DELETE      = 12
 } http_method_in_r2_codes;
 
 /*************************************************************/