← Back to branch summary

~britco/nginx/master

« back to all changes in this revision

Viewing changes to src/http/ngx_http_variables.h

  • Committer: Bazaar Package Importer
  • Author(s): Kartik Mistry, Kartik Mistry, Michael Lustfield
  • Date: 2010-11-27 21:04:02 UTC
  • mfrom: (1.3.8 upstream)
  • mto: This revision was merged to the branch mainline in revision 36.
  • Revision ID: james.westby@ubuntu.com-20101127210402-14sgjpe6r3jup8a9
Tags: 0.8.53-1
http://bugs.debian.org/592147
http://bugs.debian.org/593142
http://bugs.debian.org/593143
http://bugs.debian.org/594598
http://bugs.debian.org/602970
http://bugs.debian.org/581416
[Kartik Mistry]
* debian/control:
  + Added Michael Lustfield as co-maintainer
* nginx.conf:
  + No need to use regex in gzip_disable for msie6, Thanks to António P. P.
    Almeida <appa@perusio.net> (Closes: #592147)
* conf/sites-available/default:
  + Fixed typo for "include fastcgi", Thanks to Mostafa Ghadamyari
    <nginx@gigfa.com> (Closes: #593142, #593143)
* debian/patches/fix_reloading_ipv6.diff:
  + Removed, merged upstream
* debian/init.d:
  + Added fix to control nginx by user in a simple way by setting DAEMON
    variable to an invalid name in /etc/default/nginx. Patch by Toni Mueller
    <support@oeko.net> (Closes: #594598)
* debian/NEWS.Debian:
  + Updated news for 0.8.x as stable branch

[Michael Lustfield]
* New upstream release (Closes: #602970)
  + 0.8.x branch is declared stable by upstream now
* Add a UFW profile set:
  + debian/nginx.ufw.profile: Added.
  + debian/control: nginx: Suggests ufw.
  + debian/dirs: Add 'etc/ufw/applications.d'
  + debian/rules: Add install rule for the nginx UFW profile.
* Moved debian/dirs to debian/nginx.dirs
* Added types_hash_max_size to nginx.conf
* Install simple default index.html file (Closes: #581416)
  + debian/dirs: Add 'usr/share/nginx/www'.
  + debian/nginx.install: Add 'html/* usr/share/nginx/www'.
* debian/patches/nginx-echo.diff:
  + Added Echo module
* Added files for nginx.docs
  - /usr/share/doc/nginx/
    + debian/help/docs/fcgiwrap
    + debian/help/docs/php
    + debian/help/docs/support-irc
    + debian/help/docs/upstream
* Added files for nginx.examples
  - /usr/share/doc/nginx/examples/
    + debian/help/docs/drupal
    + debian/help/docs/http
    + debian/help/docs/mail
    + debian/help/docs/mailman
    + debian/help/docs/nginx.conf
    + debian/help/docs/virtual_hosts
    + debian/help/docs/wordpress
* debian/conf/:
  + Removed excess spaces
  + Added tabs where appropriate
  + Added SCRIPT_FILENAME to fastcgi_params

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/http/ngx_http_variables.h
59
59
#define ngx_http_clear_variable(r, index) r->variables0[index].text.data = NULL;
60
60
 
61
61
 
 
62
#if (NGX_PCRE)
 
63
 
 
64
typedef struct {
 
65
    ngx_uint_t                    capture;
 
66
    ngx_int_t                     index;
 
67
} ngx_http_regex_variable_t;
 
68
 
 
69
 
 
70
typedef struct {
 
71
    ngx_regex_t                  *regex;
 
72
    ngx_uint_t                    ncaptures;
 
73
    ngx_http_regex_variable_t    *variables;
 
74
    ngx_uint_t                    nvariables;
 
75
    ngx_str_t                     name;
 
76
} ngx_http_regex_t;
 
77
 
 
78
 
 
79
ngx_http_regex_t *ngx_http_regex_compile(ngx_conf_t *cf,
 
80
    ngx_regex_compile_t *rc);
 
81
ngx_int_t ngx_http_regex_exec(ngx_http_request_t *r, ngx_http_regex_t *re,
 
82
    ngx_str_t *s);
 
83
 
 
84
#endif
 
85
 
 
86
 
62
87
ngx_int_t ngx_http_variables_add_core_vars(ngx_conf_t *cf);
63
88
ngx_int_t ngx_http_variables_init_vars(ngx_conf_t *cf);
64
89
 
65
90
 
66
 
typedef struct {
67
 
    ngx_rbtree_node_t             node;
68
 
    size_t                        len;
69
 
    ngx_http_variable_value_t    *value;
70
 
} ngx_http_variable_value_node_t;
71
 
 
72
 
 
73
 
void ngx_http_variable_value_rbtree_insert(ngx_rbtree_node_t *temp,
74
 
    ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel);
75
 
ngx_http_variable_value_t *ngx_http_variable_value_lookup(ngx_rbtree_t *rbtree,
76
 
    ngx_str_t *name, uint32_t hash);
77
 
 
78
 
 
79
91
extern ngx_http_variable_value_t  ngx_http_variable_null_value;
80
92
extern ngx_http_variable_value_t  ngx_http_variable_true_value;
81
93