← Back to branch summary

~ubuntu-branches/debian/sid/apr/sid

« back to all changes in this revision

Viewing changes to file_io/win32/pipe.c

  • Committer: Package Import Robot
  • Author(s): Stefan Fritsch
  • Date: 2013-12-30 16:37:54 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20131230163754-mn1794cg19jswqqj
Tags: 1.5.0-1
* New upstream version
* Pull changes from upstream 1.5.x branch up to r1552863 to fix problems
  on the FreeBSD 10 kernel with accept4() and non-blocking sockets.

Show diffs side-by-side

added added

removed removed

Lines of Context:
file_io/win32/pipe.c
107
107
    (*in)->dataRead = 0;
108
108
    (*in)->direction = 0;
109
109
    (*in)->pOverlapped = NULL;
 
110
#if APR_FILES_AS_SOCKETS
110
111
    (void) apr_pollset_create(&(*in)->pollset, 1, p, 0);
111
 
 
 
112
#endif
112
113
    (*out) = (apr_file_t *)apr_pcalloc(p, sizeof(apr_file_t));
113
114
    (*out)->pool = p;
114
115
    (*out)->fname = NULL;
121
122
    (*out)->dataRead = 0;
122
123
    (*out)->direction = 0;
123
124
    (*out)->pOverlapped = NULL;
 
125
#if APR_FILES_AS_SOCKETS
124
126
    (void) apr_pollset_create(&(*out)->pollset, 1, p, 0);
125
 
 
 
127
#endif
126
128
    if (apr_os_level >= APR_WIN_NT) {
127
129
        /* Create the read end of the pipe */
128
130
        dwOpenMode = PIPE_ACCESS_INBOUND;
210
212
    (*file)->timeout = -1;
211
213
    (*file)->ungetchar = -1;
212
214
    (*file)->filehand = *thefile;
 
215
#if APR_FILES_AS_SOCKETS
213
216
    (void) apr_pollset_create(&(*file)->pollset, 1, pool, 0);
214
 
 
 
217
#endif
215
218
    if (register_cleanup) {
216
219
        apr_pool_cleanup_register(pool, *file, file_cleanup,
217
220
                                  apr_pool_cleanup_null);