[naviserver-commits] naviserver/nsd fastpath.c,1.8,1.9

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/naviserver/nsd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14522/nsd

Modified Files:
	fastpath.c 
Log Message:
see ChangeLog


Index: fastpath.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/fastpath.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** fastpath.c	29 Jun 2005 15:53:21 -0000	1.8
--- fastpath.c	29 Jun 2005 23:27:50 -0000	1.9
***************
*** 709,712 ****
--- 709,716 ----
          && (range = strstr(range,"bytes=")) != NULL) {
          range += 6;
+         /* Multiple ranges are not supported yet */
+         if (strchr(range,',') != NULL) {
+             return NS_ERROR;
+         }
          if (isdigit(*range)) {
              *offset1 = atol(range);
***************
*** 721,727 ****
                  } else {
                      *offset2 = atol(range);
!                 }
!                 if (*offset2 >= size) {
!                     *offset2 = size - 1;
                  }
                  return NS_OK;
--- 725,734 ----
                  } else {
                      *offset2 = atol(range);
!                     if (*offset1 > *offset2) {
!                         return NS_ERROR;
!                     }
!                     if (*offset2 >= size) {
!                         *offset2 = size - 1;
!                     }
                  }
                  return NS_OK;