You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2002/06/04 04:21:36 UTC

cvs commit: httpd-2.0/modules/arch/win32 mod_isapi.c

wrowe       2002/06/03 19:21:36

  Modified:    modules/arch/win32 mod_isapi.c
  Log:
    Feedback appreciated - I'm guessing that we can trust the isapi app
    opened file handles correctly for the TransmitFile case.
  
  Revision  Changes    Path
  1.79      +6 -1      httpd-2.0/modules/arch/win32/mod_isapi.c
  
  Index: mod_isapi.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/arch/win32/mod_isapi.c,v
  retrieving revision 1.78
  retrieving revision 1.79
  diff -u -r1.78 -r1.79
  --- mod_isapi.c	29 May 2002 21:23:03 -0000	1.78
  +++ mod_isapi.c	4 Jun 2002 02:21:36 -0000	1.79
  @@ -963,7 +963,12 @@
               return 0;
           }
           
  -        if ((rv = apr_os_file_put(&fd, &tf->hFile, 0, r->pool)) != APR_SUCCESS) {
  +        /* Presume the handle was opened with the CORRECT semantics
  +         * for TransmitFile 
  +         */
  +        if ((rv = apr_os_file_put(&fd, &tf->hFile, 
  +                                  APR_READ | APR_XTHREAD, r->pool)) 
  +                != APR_SUCCESS) {
               return 0;
           }
           if (tf->BytesToWrite) {