← Back to branch summary

~britco/nginx/master

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Cyril Lavier, Cyril Lavier, Kartik Mistry
  • Date: 2012-04-13 16:58:59 UTC
  • mfrom: (4.2.48 sid)
  • Revision ID: package-import@ubuntu.com-20120413165859-ef6fkd11mudyaspr
Tags: 1.1.19-1
http://bugs.debian.org/667894
[Cyril Lavier]
* New upstream release.
  + Fixed a buffer overflow in the ngx_http_mp4_module. See: CVE-2012-2089
    for more details.
* debian/copyright:
  + Updated licenses.
* debian/nginx-extras.postinst, debian/nginx-full.postinst,
  debian/nginx-light.postinst, debian/nginx-naxsi.postinst:
  + Removing the debug markers. (Closes: #667894)
* debian/control, debian/rules, debian/copyright,
  debian/modules/nginx-dav-ext-module:
  + Added nginx-dav-ext-module in full and extras.
* debian/modules/naxsi:
  + Updated naxsi to the SVN snapshot (r280) to fix the licence issue with
    OpenSSL.

[Kartik Mistry]
* Misc cleanups in debian/control, debian/copyright.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/http/modules/ngx_http_log_module.c
80
80
 
81
81
static u_char *ngx_http_log_connection(ngx_http_request_t *r, u_char *buf,
82
82
    ngx_http_log_op_t *op);
 
83
static u_char *ngx_http_log_connection_requests(ngx_http_request_t *r,
 
84
    u_char *buf, ngx_http_log_op_t *op);
83
85
static u_char *ngx_http_log_pipe(ngx_http_request_t *r, u_char *buf,
84
86
    ngx_http_log_op_t *op);
85
87
static u_char *ngx_http_log_time(ngx_http_request_t *r, u_char *buf,
193
195
 
194
196
static ngx_http_log_var_t  ngx_http_log_vars[] = {
195
197
    { ngx_string("connection"), NGX_ATOMIC_T_LEN, ngx_http_log_connection },
 
198
    { ngx_string("connection_requests"), NGX_INT_T_LEN,
 
199
                          ngx_http_log_connection_requests },
196
200
    { ngx_string("pipe"), 1, ngx_http_log_pipe },
197
201
    { ngx_string("time_local"), sizeof("28/Sep/1970:12:00:00 +0600") - 1,
198
202
                          ngx_http_log_time },
501
505
ngx_http_log_connection(ngx_http_request_t *r, u_char *buf,
502
506
    ngx_http_log_op_t *op)
503
507
{
504
 
    return ngx_sprintf(buf, "%ui", r->connection->number);
 
508
    return ngx_sprintf(buf, "%uA", r->connection->number);
 
509
}
 
510
 
 
511
 
 
512
static u_char *
 
513
ngx_http_log_connection_requests(ngx_http_request_t *r, u_char *buf,
 
514
    ngx_http_log_op_t *op)
 
515
{
 
516
    return ngx_sprintf(buf, "%ui", r->connection->requests);
505
517
}
506
518
 
507
519