~ubuntu-branches/ubuntu/precise/nginx/precise

« back to all changes in this revision

Viewing changes to src/http/modules/ngx_http_flv_module.c

  • Committer: Package Import Robot
  • Author(s): Cyril Lavier, Cyril Lavier, Kartik Mistry
  • Date: 2012-03-18 09:31:19 UTC
  • mfrom: (4.2.46 sid)
  • Revision ID: package-import@ubuntu.com-20120318093119-vebmqxwdkfk52yjr
Tags: 1.1.17-2
[Cyril Lavier]
* debian/control:
  + Added build dependency to dpkg-dev (>= 1.15.7). (Closes: #664212)
* debian/patches/perl-use-dpkg-buildflags.patch:
  + Added patch to harden flags for perl module (Thanks to Simon Ruderich
    for the patch). (Closes: #664090)

[Kartik Mistry]
* Set urgency due to fix for security and RC bugs with 1.17.1-1 upload.

Show diffs side-by-side

added added

removed removed

Lines of Context:
110
110
    of.errors = clcf->open_file_cache_errors;
111
111
    of.events = clcf->open_file_cache_events;
112
112
 
 
113
    if (ngx_http_set_disable_symlinks(r, clcf, &path, &of) != NGX_OK) {
 
114
        return NGX_HTTP_INTERNAL_SERVER_ERROR;
 
115
    }
 
116
 
113
117
    if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool)
114
118
        != NGX_OK)
115
119
    {
127
131
            break;
128
132
 
129
133
        case NGX_EACCES:
 
134
#if (NGX_HAVE_OPENAT)
 
135
        case NGX_EMLINK:
 
136
        case NGX_ELOOP:
 
137
#endif
130
138
 
131
139
            level = NGX_LOG_ERR;
132
140
            rc = NGX_HTTP_FORBIDDEN;