===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/sm1Socket.c,v
retrieving revision 1.5
retrieving revision 1.9
diff -u -p -r1.5 -r1.9
--- OpenXM/src/kan96xx/plugin/sm1Socket.c	2002/10/17 13:40:29	1.5
+++ OpenXM/src/kan96xx/plugin/sm1Socket.c	2002/10/21 01:59:16	1.9
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kan96xx/plugin/sm1Socket.c,v 1.4 2001/08/12 03:13:36 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/plugin/sm1Socket.c,v 1.8 2002/10/21 01:11:44 takayama Exp $ */
 /* msg0s.c */
 #include <stdio.h>
 #include <sys/types.h>
@@ -15,6 +15,9 @@
 
 extern int Quiet;
 static void errorMsg1s(char *s);
+static int getContentLength(char *s);
+static int getReceivedContentLength(char *s);
+#define MAX_LISTEN_QUEUE 3
 
 /* [(sm1.socket) (open) [optional integer port, optional string name] ] extension ; */
 struct object KsocketOpen(struct object obj) {
@@ -78,7 +81,7 @@ struct object KsocketOpen(struct object obj) {
   }
 
   
-  if (listen(s_waiting,1) < 0) {
+  if (listen(s_waiting,MAX_LISTEN_QUEUE) < 0) {
     errorMsg1s("Listen failed");
   }
   /*  
@@ -528,56 +531,76 @@ struct object KsocketWriteByte(struct object obj) {
   return(KpoInteger(r));
 }
 
-struct object KsocketReadBlock(struct object socketObj) {
-  /* Read until the empty line appears. */
+struct object KsocketReadHTTP(struct object socketObj) {
+  /* Read until two empty line appears. */
   struct object ob;
   char *s;
   char *sss;
   char *tmp;
   int i;
   int flag;
+  int flagmax = 1;
   int datasize;
+  int last;
+  int contentLength=-1;
   ob = KsocketRead(socketObj);
   s = KopString(ob);
+  if (strncmp(s,"POST",4) == 0) flagmax=2; /* for IE */
+  else flagmax=1;
   flag = 0;
   for (i=strlen(s)-1; i>=0; i--) {
 	if ((s[i] == '\n') && (i==0)) {
-	  flag = 1;
+	  ++flag;
 	}else if ((s[i] == '\n') && (s[i-1] == '\n')) {
-	  flag = 1;
+	  ++flag;
 	}else if ((s[i] == 0xd) && (s[i+1] == 0xa) && (i == 0)) {
-	  flag = 1;
+	  ++flag;
 	}else if ((s[i] == 0xa) && (s[i-1] == 0xd) && (s[i+1] == 0xd) && (s[i+2] == 0xa)) {
-	  flag = 1;
+	  ++flag;
 	}
   }
-  if (flag == 1) return ob;
+  if (flag >= flagmax) return ob;
   datasize = strlen(s);
   sss = s;
+  if ((s[strlen(s)-1] == '\n') ||
+      (s[strlen(s)-2] == 0xd) && (s[strlen(s)-1] == 0xa)) {
+	last = 1;
+  }else last = 0;
 
-  while (flag == 0) {
-	fprintf(stderr,"Waiting in socketReadBlock (spin lock to wait an empty line).\n");
+  while (flag < flagmax) {
+	contentLength = getContentLength(sss);
+	if (contentLength != -1) {
+	  if (contentLength <= getReceivedContentLength(sss)) {
+		break;
+	  }
+	}
+	fprintf(stderr,"Waiting in socketReadBlock (spin lock to wait an empty line). flagmax(0d,0a)=%d, contentLength=%d\n",flagmax,contentLength);
 	if (strlen(s) == 0) {fprintf(stderr,"but I'm not receiving data. Expecting a bug.\n");
 	}else{
 	  /* for debugging. */
 	  for (i=0; i<strlen(sss); i++) {
-		fprintf(stderr,"%3x",sss[i]);
+		if ((sss[i] >= ' ') && (sss[i] < 0x7f)) {
+		  fprintf(stderr,"%c",sss[i]);
+		}else{
+          fprintf(stderr,"(%3x)",sss[i]);
+		  if (sss[i] == 0xa) fprintf(stderr,"\n");
+		}
+
 	  }
 	  fprintf(stderr,"\n");
 	}
 	sleep(2);
 	ob = KsocketRead(socketObj);
 	s = KopString(ob);
-	flag = 0;
 	for (i=strlen(s)-1; i>=0; i--) {
-	  if ((s[i] == '\n') && (i==0)) {
-		flag = 1;
+	  if ((s[i] == '\n') && (i==0) && last) {
+		++flag;
 	  }else if ((s[i] == '\n') && (s[i-1] == '\n')) {
-		flag = 1;
-	  }else if ((s[i] == 0xd) && (s[i+1] == 0xa) && (i == 0)) {
-		flag = 1;
+		++flag;
+	  }else if ((s[i] == 0xd) && (s[i+1] == 0xa) && (i==0) && last) {
+		++flag;
 	  }else if ((s[i] == 0xa) && (s[i-1] == 0xd) && (s[i+1] == 0xd) && (s[i+2] == 0xa)) {
-		flag = 1;
+		++flag;
 	  }
 	}
 	if (datasize-1 <= strlen(sss)+strlen(s)) {
@@ -590,6 +613,12 @@ struct object KsocketReadBlock(struct object socketObj
 	}else{
 	  strcat(sss,s);
 	}
+
+	if ((s[strlen(s)-1] == '\n') ||
+		(s[strlen(s)-2] == 0xd) && (s[strlen(s)-1] == 0xa)) {
+	  last = 1;
+	}else last = 0;
+
   }
 
   return KpoString(sss);
@@ -610,8 +639,8 @@ struct object Kplugin_sm1Socket(char *key,struct objec
     robj = KsocketSelectMulti(obj);
   }else if (strcmp(key,"read") == 0) {
     robj = KsocketRead(obj);
-  }else if (strcmp(key,"readBlock") == 0) {
-    robj = KsocketReadBlock(obj);
+  }else if (strcmp(key,"readHTTP") == 0) {
+    robj = KsocketReadHTTP(obj);
   }else if (strcmp(key,"write") == 0) {
     robj = KsocketWrite(obj);
   }else if (strcmp(key,"read") == 0) {
@@ -629,6 +658,38 @@ struct object Kplugin_sm1Socket(char *key,struct objec
 }
 
 
+static int getContentLength(char *s) {
+  int n;
+  int i;
+  int len = -1;
+  char *s1 = "Content-length:";
+  char *s2 = "CONTENT-LENGTH:";
+  n = strlen(s);
+  for (i=0; i<n; i++) {
+	if ((strncmp(&(s[i]),s1,strlen(s1)) == 0) ||
+		(strncmp(&(s[i]),s2,strlen(s2)) == 0)) {
+	  sscanf(&(s[i+strlen(s1)]),"%d",&len);
+	  break;
+	}
+  }
+  return len;
+}
+static int getReceivedContentLength(char *s) {
+  int n;
+  int i;
+  int start;
+  start = -1;
+  n = strlen(s);
+  for (i=0; i<n; i++) {
+	if ((s[i] == '\n') && (s[i+1] == '\n')) {
+	  start = i+2; break;
+	}else if ((s[i] == 0xd) && (s[i+1] == 0xa) && (s[i+2] == 0xd) && (s[i+3] == 0xa)) {
+	  start = i+4;
+	}
+  }
+  if (start == -1) return 0;
+  return (n-start);
+}