← Back to branch summary

~britco/nginx/master

« back to all changes in this revision

Viewing changes to src/http/ngx_http_script.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_script.h
114
114
 
115
115
typedef struct {
116
116
    ngx_http_script_code_pt     code;
117
 
    ngx_regex_t                *regex;
 
117
    ngx_http_regex_t           *regex;
118
118
    ngx_array_t                *lengths;
119
119
    uintptr_t                   size;
120
 
    uintptr_t                   ncaptures;
121
120
    uintptr_t                   status;
122
121
    uintptr_t                   next;
123
122
 
160
159
typedef struct {
161
160
    ngx_http_script_code_pt     code;
162
161
    uintptr_t                   status;
163
 
    uintptr_t                   null;
 
162
    ngx_http_complex_value_t    text;
164
163
} ngx_http_script_return_code_t;
165
164
 
166
165
 
208
207
ngx_int_t ngx_http_complex_value(ngx_http_request_t *r,
209
208
    ngx_http_complex_value_t *val, ngx_str_t *value);
210
209
ngx_int_t ngx_http_compile_complex_value(ngx_http_compile_complex_value_t *ccv);
 
210
char *ngx_http_set_complex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd,
 
211
    void *conf);
 
212
 
 
213
 
 
214
ngx_int_t ngx_http_test_predicates(ngx_http_request_t *r,
 
215
    ngx_array_t *predicates);
 
216
char *ngx_http_set_predicate_slot(ngx_conf_t *cf, ngx_command_t *cmd,
 
217
    void *conf);
211
218
 
212
219
ngx_uint_t ngx_http_script_variables_count(ngx_str_t *value);
213
220
ngx_int_t ngx_http_script_compile(ngx_http_script_compile_t *sc);