stas        2003/09/19 11:07:04

  Modified:    .        CHANGES
               file_io/win32 filedup.c
  Log:
  fix apr_file_dup() and apr_file_dup2() to dup the ungetchar member
  
  Revision  Changes    Path
  1.434     +3 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.433
  retrieving revision 1.434
  diff -u -u -r1.433 -r1.434
  --- CHANGES	17 Sep 2003 19:05:43 -0000	1.433
  +++ CHANGES	19 Sep 2003 18:07:04 -0000	1.434
  @@ -63,6 +63,9 @@
   
   Changes with APR 0.9.4
   
  +  *) fix apr_file_dup() and apr_file_dup2() to dup the ungetchar
  +     member [Stas Bekman]
  +
     *) Preserve leading '../' segments as when merging to an empty and
        unrooted path - fixes a bug observed in SVN with Win32/Netware/OS2.
        [Mike Pilato <cmpilato@collab.net>, William Rowe]
  
  
  
  1.55      +2 -0      apr/file_io/win32/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/filedup.c,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -u -r1.54 -r1.55
  --- filedup.c	7 Jan 2003 00:52:53 -0000	1.54
  +++ filedup.c	19 Sep 2003 18:07:04 -0000	1.55
  @@ -81,6 +81,7 @@
       (*new_file)->fname = apr_pstrdup(p, old_file->fname);
       (*new_file)->append = old_file->append;
       (*new_file)->buffered = FALSE;
  +    (*new_file)->ungetchar = old_file->ungetchar;
   
       apr_pool_cleanup_register((*new_file)->pool, (void *)(*new_file), file_cleanup,
                           apr_pool_cleanup_null);
  @@ -150,6 +151,7 @@
       new_file->fname = apr_pstrdup(new_file->pool, old_file->fname);
       new_file->append = old_file->append;
       new_file->buffered = FALSE;
  +    new_file->ungetchar = old_file->ungetchar;
   
       return APR_SUCCESS;
   #endif /* !defined(_WIN32_WCE) */