← Back to branch summary

~ubuntu-branches/ubuntu/precise/mod-wsgi/precise-updates

« back to all changes in this revision

Viewing changes to mod_wsgi.c

  • Committer: Bazaar Package Importer
  • Author(s): Piotr Ożarowski
  • Date: 2009-11-29 14:07:48 UTC
  • mfrom: (1.1.7 upstream) (3.1.5 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091129140748-t4so6smoat81ti7o
Tags: 2.8-1
http://bugs.debian.org/558589
* New upstream release
* Remove postrm maintainer script, no longer needed as Lenny doesn't have
  mod-wsgi.{conf,load} anymore and this script was removing new files (which
  is handled by dpkg, closes: 558589)

Show diffs side-by-side

added added

removed removed

Lines of Context:
mod_wsgi.c
245
245
/* Version and module information. */
246
246
 
247
247
#define MOD_WSGI_MAJORVERSION_NUMBER 2
248
 
#define MOD_WSGI_MINORVERSION_NUMBER 6
249
 
#define MOD_WSGI_VERSION_STRING "2.6"
 
248
#define MOD_WSGI_MINORVERSION_NUMBER 8
 
249
#define MOD_WSGI_VERSION_STRING "2.8"
250
250
 
251
251
#if AP_SERVER_MAJORVERSION_NUMBER < 2
252
252
module MODULE_VAR_EXPORT wsgi_module;
9568
9568
    apr_os_pipe_put_ex(&tmpsock, &daemon->fd, 1, r->pool);
9569
9569
    apr_pool_cleanup_kill(r->pool, daemon, wsgi_close_socket);
9570
9570
 
 
9571
    apr_file_pipe_timeout_get(tmpsock, &timeout);
 
9572
    apr_file_pipe_timeout_set(tmpsock, r->server->timeout);
 
9573
 
9571
9574
    /* Setup bucket brigade for reading response from daemon. */
9572
9575
 
9573
9576
    bbin = apr_brigade_create(r->pool, r->connection->bucket_alloc);
9662
9665
            apr_os_pipe_put_ex(&tmpsock, &daemon->fd, 1, r->pool);
9663
9666
            apr_pool_cleanup_kill(r->pool, daemon, wsgi_close_socket);
9664
9667
 
 
9668
            apr_file_pipe_timeout_get(tmpsock, &timeout);
 
9669
            apr_file_pipe_timeout_set(tmpsock, r->server->timeout);
 
9670
 
9665
9671
            apr_brigade_destroy(bbin);
9666
9672
 
9667
9673
            bbin = apr_brigade_create(r->pool, r->connection->bucket_alloc);
9687
9693
 
9688
9694
    bbout = apr_brigade_create(r->pool, r->connection->bucket_alloc);
9689
9695
 
9690
 
    apr_file_pipe_timeout_get(tmpsock, &timeout);
9691
 
    apr_file_pipe_timeout_set(tmpsock, r->server->timeout);
9692
 
 
9693
9696
    do {
9694
9697
        apr_bucket *bucket;
9695
9698