← Back to branch summary

~ubuntu-branches/ubuntu/trusty/serf/trusty-updates

« back to all changes in this revision

Viewing changes to context.c

  • Committer: Bazaar Package Importer
  • Author(s): Peter Samuelson
  • Date: 2010-02-14 23:04:17 UTC
  • mfrom: (1.2.3 upstream)
  • mto: (3.3.1 sid)
  • mto: This revision was merged to the branch mainline in revision 9.
  • Revision ID: james.westby@ubuntu.com-20100214230417-8zjz7vd5plcoykaz
* New upstream release.
  - patches/libtool: update.

Show diffs side-by-side

added added

removed removed

Lines of Context:
context.c
691
691
                                         &request->handler,
692
692
                                         &request->handler_baton,
693
693
                                         request->respool);
 
694
 
 
695
            if (read_status) {
 
696
                /* Something bad happened. Propagate any errors. */
 
697
                return read_status;
 
698
            }
 
699
 
694
700
            request->setup = NULL;
695
701
        }
696
702
 
1185
1191
    apr_pool_create(&conn->skt_pool, conn->pool);
1186
1192
 
1187
1193
    /* register a cleanup */
1188
 
    apr_pool_cleanup_register(conn->pool, conn, clean_conn, clean_conn);
 
1194
    apr_pool_cleanup_register(conn->pool, conn, clean_conn, apr_pool_cleanup_null);
1189
1195
 
1190
1196
    /* Add the connection to the context. */
1191
1197
    *(serf_connection_t **)apr_array_push(ctx->conns) = conn;