← Back to branch summary

~ubuntu-branches/ubuntu/wily/nginx/wily-proposed

« back to all changes in this revision

Viewing changes to src/http/ngx_http_variables.h

  • Committer: Package Import Robot
  • Author(s): Dmitry Shachnev
  • Date: 2013-05-11 14:47:53 UTC
  • mfrom: (4.3.1 sid)
  • Revision ID: package-import@ubuntu.com-20130511144753-a65vqwrxy58omej4
Tags: 1.4.1-1ubuntu1
https://launchpad.net/bugs/1177919
https://launchpad.net/bugs/1162177
* Merge with Debian unstable (LP: #1177919). Remaining changes:
  - debian/conf/sites-available/default:
    + Modify default site configuration file to correct a typo
      that prevented out-of-the-box usability (LP: #1162177).
  - debian/patches/ubuntu-branding.patch:
    + Add ubuntu branding to server_tokens.
* Refresh all patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/http/ngx_http_variables.h
57
57
    ngx_str_t *var, ngx_list_part_t *part, size_t prefix);
58
58
 
59
59
 
60
 
#define ngx_http_clear_variable(r, index) r->variables0[index].text.data = NULL;
61
 
 
62
 
 
63
60
#if (NGX_PCRE)
64
61
 
65
62
typedef struct {