=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/sm1Socket.c,v retrieving revision 1.13 retrieving revision 1.15 diff -u -p -r1.13 -r1.15 --- OpenXM/src/kan96xx/plugin/sm1Socket.c 2002/10/24 02:12:35 1.13 +++ OpenXM/src/kan96xx/plugin/sm1Socket.c 2003/09/16 02:57:40 1.15 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/kan96xx/plugin/sm1Socket.c,v 1.12 2002/10/24 01:29:00 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kan96xx/plugin/sm1Socket.c,v 1.14 2002/10/30 13:23:06 takayama Exp $ */ /* msg0s.c */ #include #include @@ -14,6 +14,7 @@ #include "sm1Socket.h" extern int Quiet; +static int Post_debug=0; static void errorMsg1s(char *s); static int getContentLength(char *s); static int getReceivedContentLength(char *s); @@ -30,7 +31,12 @@ struct object KsocketOpen(struct object obj) { int on; int tt; extern int errno; + extern int Post_debug; + if ((char *)getenv("OXWEB_DEBUG") != NULL) { + Post_debug = 1; + } + if (obj.tag != Sarray) { errorMsg1s("KsocketOpen([optional integer,optional string name])"); } @@ -173,7 +179,11 @@ struct object KsocketAccept(struct object obj) { } s = KopInteger(obj1); if ((news = accept(s,NULL,NULL)) < 0) { - errorMsg1s("Error in accept."); + fprintf(stderr,"Error in accept. Retrying (KsocketAccept).\n"); + /* Code added for strange behavior on cygwin. */ + if ((news = accept(s,NULL,NULL)) < 0) { + errorMsg1s("Error in accept. Retry failed."); + } } if (close(s) < 0) { errorMsg1s("Error in closing the old socket."); @@ -209,7 +219,11 @@ struct object KsocketAccept2(struct object obj) { } s = KopInteger(obj1); if ((news = accept(s,NULL,NULL)) < 0) { - errorMsg1s("Error in accept."); + fprintf(stderr,"Error in accept. Retrying (KsocketAccept2).\n"); + /* Code added for strange behavior on cygwin. */ + if ((news = accept(s,NULL,NULL)) < 0) { + errorMsg1s("Error in accept. Retry failed."); + } } if (close(s) < 0) { errorMsg1s("Error in closing the old socket."); @@ -582,6 +596,7 @@ struct object KsocketReadHTTP(struct object socketObj) int last; int contentLength=-1; int socketid; + extern int Post_debug; nob = NullObject; if (socketObj.tag != Sarray) { @@ -630,22 +645,26 @@ struct object KsocketReadHTTP(struct object socketObj) break; } } - fprintf(stderr,"Waiting in socketReadBlock. flagmax(0d,0a)=%d, content-length=%d, received content-length=%d\n",flagmax,contentLength,getReceivedContentLength(sss)); + if (Post_debug) { + fprintf(stderr,"Waiting in socketReadBlock. flagmax(0d,0a)=%d, content-length=%d, received content-length=%d\n",flagmax,contentLength,getReceivedContentLength(sss)); + } if (strlen(s) == 0) { fprintf(stderr,"No data. Perhaps connection is closed by foreign host.\n"); return nob; }else{ /* for debugging. */ - for (i=0; i= ' ') && (sss[i] < 0x7f)) { - fprintf(stderr,"%c",sss[i]); - }else{ - fprintf(stderr,"(%3x)",sss[i]); - if (sss[i] == 0xa) fprintf(stderr,"\n"); - } + if (Post_debug) { + for (i=0; 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"); } - fprintf(stderr,"\n"); } if (KsocketSelect0(socketid,-1) != 1) {