~spuul/nginx/trunk

« back to all changes in this revision

Viewing changes to src/http/ngx_http_spdy.c

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2014-02-15 03:05:42 UTC
  • mfrom: (4.3.10 sid)
  • Revision ID: package-import@ubuntu.com-20140215030542-71ubtowl24vf7nfn
Tags: 1.4.5-1ubuntu1
* Resynchronise with Debian (LP: #1280511).  Remaining changes:
  - debian/patches/ubuntu-branding.patch:
    + Add Ubuntu branding to server_tokens.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2626
2626
        }
2627
2627
    }
2628
2628
 
 
2629
    if (sc->stream == stream) {
 
2630
        sc->stream = NULL;
 
2631
    }
 
2632
 
2629
2633
    sscf = ngx_http_get_module_srv_conf(sc->http_connection->conf_ctx,
2630
2634
                                        ngx_http_spdy_module);
2631
2635