nginx-0.3.7-RELEASE import
*) Feature: the "access_log" supports the "buffer=" parameter.
*) Bugfix: nginx could not be built on platforms different from i386,
amd64, sparc, and ppc; the bug had appeared in 0.3.2.
diff --git a/src/http/modules/ngx_http_log_module.c b/src/http/modules/ngx_http_log_module.c
index 6e7772e..f4993b5 100644
--- a/src/http/modules/ngx_http_log_module.c
+++ b/src/http/modules/ngx_http_log_module.c
@@ -96,7 +96,7 @@
NULL },
{ ngx_string("access_log"),
- NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12,
+ NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE123,
ngx_http_log_set_log,
NGX_HTTP_LOC_CONF_OFFSET,
0,
@@ -190,11 +190,9 @@
u_char *line, *p;
size_t len;
ngx_http_log_t *log;
+ ngx_open_file_t *file;
ngx_http_log_op_t *op;
ngx_http_log_loc_conf_t *lcf;
-#if (NGX_WIN32)
- u_long written;
-#endif
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"http log handler");
@@ -219,11 +217,34 @@
}
}
-#if (NGX_WIN32)
- len += 2;
-#else
- len++;
-#endif
+ len += NGX_LINEFEED_SIZE;
+
+ file = log[l].file;
+
+ if (file->buffer) {
+
+ if (len > (size_t) (file->last - file->pos)) {
+
+ ngx_write_fd(file->fd, file->buffer, file->pos - file->buffer);
+
+ file->pos = file->buffer;
+ }
+
+ if (len <= (size_t) (file->last - file->pos)) {
+
+ p = file->pos;
+
+ for (i = 0; i < log[l].ops->nelts; i++) {
+ p = op[i].run(r, p, &op[i]);
+ }
+
+ ngx_linefeed(p);
+
+ file->pos = p;
+
+ continue;
+ }
+ }
line = ngx_palloc(r->pool, len);
if (line == NULL) {
@@ -236,13 +257,9 @@
p = op[i].run(r, p, &op[i]);
}
-#if (NGX_WIN32)
- *p++ = CR; *p++ = LF;
- WriteFile(log[l].file->fd, line, p - line, &written, NULL);
-#else
- *p++ = LF;
- write(log[l].file->fd, line, p - line);
-#endif
+ ngx_linefeed(p);
+
+ ngx_write_fd(file->fd, line, p - line);
}
return NGX_OK;
@@ -942,6 +959,7 @@
{
ngx_http_log_loc_conf_t *llcf = conf;
+ ssize_t buf;
ngx_uint_t i;
ngx_str_t *value, name;
ngx_http_log_t *log;
@@ -974,7 +992,7 @@
return NGX_CONF_ERROR;
}
- if (cf->args->nelts == 3) {
+ if (cf->args->nelts >= 3) {
name = value[2];
} else {
name.len = sizeof("combined") - 1;
@@ -987,14 +1005,51 @@
&& ngx_strcasecmp(fmt[i].name.data, name.data) == 0)
{
log->ops = fmt[i].ops;
- return NGX_CONF_OK;
+ goto buffer;
}
}
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"unknown log format \"%V\"", &name);
-
return NGX_CONF_ERROR;
+
+buffer:
+
+ if (cf->args->nelts == 4) {
+ if (ngx_strncmp(value[3].data, "buffer=", 7) != 0) {
+ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+ "invalid parameter \"%V\"", &value[3]);
+ return NGX_CONF_ERROR;
+ }
+
+ name.len = value[3].len - 7;
+ name.data = value[3].data + 7;
+
+ buf = ngx_parse_size(&name);
+
+ if (buf == NGX_ERROR) {
+ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+ "invalid parameter \"%V\"", &value[3]);
+ return NGX_CONF_ERROR;
+ }
+
+ if (log->file->buffer && log->file->last - log->file->pos != buf) {
+ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+ "access_log \"%V\" already defined "
+ "with different buffer size", &value[1]);
+ return NGX_CONF_ERROR;
+ }
+
+ log->file->buffer = ngx_palloc(cf->pool, buf);
+ if (log->file->buffer == NULL) {
+ return NGX_CONF_ERROR;
+ }
+
+ log->file->pos = log->file->buffer;
+ log->file->last = log->file->buffer + buf;
+ }
+
+ return NGX_CONF_OK;
}
diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
index 3cb3bdf..e395400 100644
--- a/src/http/ngx_http_variables.c
+++ b/src/http/ngx_http_variables.c
@@ -36,6 +36,8 @@
ngx_http_variable_request_method(ngx_http_request_t *r, uintptr_t data);
static ngx_http_variable_value_t *
ngx_http_variable_remote_user(ngx_http_request_t *r, uintptr_t data);
+static ngx_http_variable_value_t *
+ ngx_http_variable_sent(ngx_http_request_t *r, uintptr_t data);
/*
@@ -44,8 +46,7 @@
* REMOTE_HOST (null), REMOTE_IDENT (null),
* SERVER_SOFTWARE
*
- * Apache SSI: DATE_GMT, DOCUMENT_NAME, LAST_MODIFIED,
- * USER_NAME (file owner)
+ * Apache SSI: DOCUMENT_NAME, LAST_MODIFIED, USER_NAME (file owner)
*/
static ngx_http_variable_t ngx_http_core_variables[] = {
@@ -116,6 +117,10 @@
{ ngx_string("remote_user"), ngx_http_variable_remote_user, 0, 0, 0 },
+ { ngx_string("sent"), ngx_http_variable_sent, 0, 0, 0 },
+
+ { ngx_string("apache_sent"), ngx_http_variable_sent, 1, 0, 0 },
+
{ ngx_null_string, NULL, 0, 0, 0 }
};
@@ -699,6 +704,41 @@
}
+static ngx_http_variable_value_t *
+ngx_http_variable_sent(ngx_http_request_t *r, uintptr_t data)
+{
+ off_t sent;
+ u_char *p;
+ ngx_http_variable_value_t *vv;
+
+ vv = ngx_palloc(r->pool, sizeof(ngx_http_variable_value_t));
+ if (vv == NULL) {
+ return NULL;
+ }
+
+ sent = r->connection->sent;
+
+ if (data) {
+ sent -= r->header_size;
+
+ if (sent < 0) {
+ sent = 0;
+ }
+ }
+
+ p = ngx_palloc(r->pool, NGX_OFF_T_LEN);
+ if (p == NULL) {
+ return NULL;
+ }
+
+ vv->value = 0;
+ vv->text.len = ngx_sprintf(p, "%O", sent) - p;
+ vv->text.data = p;
+
+ return vv;
+}
+
+
ngx_int_t
ngx_http_variables_add_core_vars(ngx_conf_t *cf)
{
