Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (14c89c31c5cd03eca4a241af962707aa36369e06)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (14c89c31c5cd03eca4a241af962707aa36369e06)
  • Date: Fri, 7 Aug 2009 08:54:17 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

http/nginx/syslog-0.7.patch | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)

New commits:
commit 14c89c31c5cd03eca4a241af962707aa36369e06
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

nginx: backport changes from 0.6 syslog patch

diff --git a/http/nginx/syslog-0.7.patch b/http/nginx/syslog-0.7.patch
index c2a77e9..c7802fa 100644
--- a/http/nginx/syslog-0.7.patch
+++ b/http/nginx/syslog-0.7.patch
@@ -185,7 +185,19 @@

typedef struct ngx_http_log_op_s ngx_http_log_op_t;

-@@ -310,6 +313,19 @@
+@@ -183,7 +186,11 @@
+
+
+ static ngx_str_t ngx_http_combined_fmt =
++#ifdef USE_SYSLOG
++ ngx_string("$remote_addr - $remote_user "
++#else
+ ngx_string("$remote_addr - $remote_user [$time_local] "
++#endif
+ "\"$request\" $status $body_bytes_sent "
+ "\"$http_referer\" \"$http_user_agent\"");
+
+@@ -310,6 +317,19 @@
ngx_http_log_write(ngx_http_request_t *r, ngx_http_log_t *log, u_char *buf,
size_t len)
{
@@ -205,7 +217,7 @@
u_char *name;
time_t now;
ssize_t n;
-@@ -354,6 +370,7 @@
+@@ -354,6 +374,7 @@

log->error_log_time = now;
}
@@ -213,7 +225,7 @@
}


-@@ -800,7 +817,11 @@
+@@ -800,7 +821,11 @@
return NGX_CONF_ERROR;
}

@@ -225,7 +237,7 @@
if (log->file == NULL) {
return NGX_CONF_ERROR;
}
-@@ -859,7 +880,11 @@
+@@ -859,7 +884,11 @@
n = ngx_http_script_variables_count(&value[1]);

if (n == 0) {



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (14c89c31c5cd03eca4a241af962707aa36369e06), Vlad Glagolev, 08/07/2009

Archive powered by MHonArc 2.6.24.

Top of Page