Commit 070b1d55 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

  Fix GetServerVariable() to return the buffer consumed, including the
  terminating NULL.

Bug: 8934


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95087 13f79535-47bb-0310-9956-ffa450edef68
parent 320f6059
Loading
Loading
Loading
Loading
+3 −3
Changes for modules/arch/win32/mod_isapi.c: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ int APR_THREAD_FUNC GetServerVariable (isapi_cid *cid,
        }

        *(((char*)buf_data)++) = '\0';
        *buf_size = len;
        *buf_size = len + 1;
        return 1;
    }
    
@@ -594,7 +594,7 @@ int APR_THREAD_FUNC GetServerVariable (isapi_cid *cid,
            *(((char*)buf_data)++) = '\n';
        }
        *(((char*)buf_data)++) = '\0';
        *buf_size = len;
        *buf_size = len + 1;
        return 1;
    }
    
@@ -609,7 +609,7 @@ int APR_THREAD_FUNC GetServerVariable (isapi_cid *cid,
            return 0;
        }
        strcpy(buf_data, result);
        *buf_size = len;
        *buf_size = len + 1;
        return 1;
    }