Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 7 Nov 2000 14:56:03 -0000
Message-ID: <20001107145603.91130.qmail@locus.apache.org>
From: stoddard@locus.apache.org
To: apache-2.0-cvs@apache.org
Subject: cvs commit: apache-2.0/src/lib/apr/file_io/win32 pipe.c

stoddard    00/11/07 06:56:03

  Modified:    src/lib/apr aprlib.def
               src/lib/apr/file_io/win32 pipe.c
  Log:
  Add apr_get_pipe_timeout to win32.
  
  Revision  Changes    Path
  1.37      +6 -6      apache-2.0/src/lib/apr/aprlib.def
  
  Index: aprlib.def
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.def,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- aprlib.def	2000/10/23 17:21:10	1.36
  +++ aprlib.def	2000/11/07 14:56:01	1.37
  @@ -223,12 +223,12 @@
   	apr_get_remote_port @214
   	apr_set_remote_port @215
   	apr_open_stderr @216
  -        apr_set_pipe_timeout   @217
  -        apr_terminate @218
  -        apr_dso_load @219
  -        apr_dso_unload @220
  -        apr_dso_sym @221
  -;        apr_dso_init @222
  +	apr_get_pipe_timeout @217
  +        apr_set_pipe_timeout   @218
  +        apr_terminate @219
  +        apr_dso_load @220
  +        apr_dso_unload @221
  +        apr_dso_sym @222
           apr_collapse_spaces @223
   	apr_month_snames @224
   	apr_day_snames @225
  
  
  
  1.31      +14 -2     apache-2.0/src/lib/apr/file_io/win32/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/pipe.c,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- pipe.c	2000/11/02 15:23:45	1.30
  +++ pipe.c	2000/11/07 14:56:03	1.31
  @@ -65,8 +65,20 @@
   
   apr_status_t apr_set_pipe_timeout(apr_file_t *thepipe, apr_interval_time_t timeout)
   {
  -    thepipe->timeout = timeout;
  -    return APR_SUCCESS;
  +    if (thepipe->pipe == 1) {
  +        thepipe->timeout = timeout;
  +        return APR_SUCCESS;
  +    }
  +    return APR_EINVAL;
  +}
  +
  +apr_status_t apr_get_pipe_timeout(apr_file_t *thepipe, apr_interval_time_t *timeout)
  +{
  +    if (thepipe->pipe == 1) {
  +        *timeout = thepipe->timeout;
  +        return APR_SUCCESS;
  +    }
  +    return APR_EINVAL;
   }
   
   apr_status_t apr_create_pipe(apr_file_t **in, apr_file_t **out, apr_pool_t *p)