fixed the user supplied patch for bug #18792

diff --git a/main/rfc1867.c b/main/rfc1867.c
index 83d981bf2d7d7538112bed35bfe35804be4316ad..17e2b55093f90885f43faa750bb5f381201c48db 100644 (file)
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -639,10 +639,6 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler)
                return;
        }
 
-       /* search for the end of the boundary */
-       boundary_end = strchr(boundary, ',');
-       if (boundary_end ) *boundary_end = 0;
-
        boundary++;
        boundary_len = strlen(boundary);
 
@@ -654,6 +650,13 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler)
                boundary++;
                boundary_len -= 2;
                boundary[boundary_len] = '\0';
+       } else {
+               /* search for the end of the boundary */
+               boundary_end = strchr(boundary, ',');
+               if (boundary_end) {
+                       boundary_end[0] = '\0';
+                       boundary_len = boundary_end-boundary;
+               }
        }
 
        /* Initialize the buffer */