← Back to branch summary

~ubuntu-branches/ubuntu/lucid/nginx/lucid-updates

~ubuntu-branches/ubuntu/lucid/nginx/lucid-updates

« back to all changes in this revision

Viewing changes to src/http/ngx_http_upstream.c

Committer: Bazaar Package Importer
Author(s): Bhavani Shankar
Date: 2008-12-01 20:11:53 UTC
mfrom: (4.1.2 sid)
Revision ID: james.westby@ubuntu.com-20081201201153-q0ap33bcphfxriy3

Tags: 0.6.34-1ubuntu1

https://launchpad.net/bugs/303916

* Merge from debian unstable, remaining changes: (LP: #303916)
  + debian/control:
    - Add Depend on lsb >= 3.2-14, which has the status_of_proc() function.
  + debian/init.d:
    - Add sourcing to '. /lib/lsb/init-functions'
    - Add the 'status' action
  + Fixed FTBFS by properly defining IOV_MAX to its Linux equivelent.
  + Added dpatch based patch system

files modified:
CHANGES

CHANGES.ru

debian/changelog

debian/rules

src/core/nginx.c

src/core/nginx.h

src/core/ngx_conf_file.c

src/core/ngx_cycle.c

src/core/ngx_log.c

src/core/ngx_resolver.c

src/core/ngx_times.c

src/core/ngx_times.h

src/event/ngx_event_connect.c

src/event/ngx_event_openssl.c

src/http/modules/ngx_http_charset_filter_module.c

src/http/modules/ngx_http_fastcgi_module.c

src/http/modules/ngx_http_flv_module.c

src/http/modules/ngx_http_gzip_filter_module.c

src/http/modules/ngx_http_gzip_static_module.c

src/http/modules/ngx_http_headers_filter_module.c

src/http/modules/ngx_http_index_module.c

src/http/modules/ngx_http_proxy_module.c

src/http/modules/ngx_http_rewrite_module.c

src/http/modules/ngx_http_static_module.c

src/http/modules/perl/nginx.pm

src/http/ngx_http.c

src/http/ngx_http_core_module.c

src/http/ngx_http_header_filter_module.c

src/http/ngx_http_request.c

src/http/ngx_http_request.h

src/http/ngx_http_special_response.c

src/http/ngx_http_upstream.c

src/http/ngx_http_upstream_round_robin.c

src/os/unix/ngx_files.h

Show diffs side-by-side

added added

removed removed

src/http/ngx_http_upstream.c

137

137

ngx_http_upstream_copy_header_line, 0, 0 },

138

138

139

139

{ ngx_string("Location"),

140

ngx_http_upstream_ignore_header_line, 0,

140

ngx_http_upstream_process_header_line,

141

offsetof(ngx_http_upstream_headers_in_t, location),

141

142

ngx_http_upstream_rewrite_location, 0, 0 },

142

143

143

144

{ ngx_string("Refresh"),

2625

2626

2626

2627

r->headers_out.content_type_len = last - h->value.data;

2627

2628

2628

r->headers_out.charset.len = h->value.data + h->value.len - p;

2629

if (*p == '"') {

2630

p++;

2631

}

2632

2633

last = h->value.data + h->value.len;

2634

2635

if (*(last - 1) == '"') {

2636

last--;

2637

}

2638

2639

r->headers_out.charset.len = last - p;

2629

2640

r->headers_out.charset.data = p;

2630

2641

2631

2642

return NGX_OK;

Older »