Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

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

 http/nginx/DETAILS      |    1 +
 http/nginx/HISTORY      |    4 ++++
 http/nginx/syslog.patch |   47 
++++++++++++++++++++++++-----------------------
 3 files changed, 29 insertions(+), 23 deletions(-)

New commits:
commit 7341a7fef6acf897b5de0e318018073856c22b85
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    nginx: fixed syslogging for some extra error

diff --git a/http/nginx/DETAILS b/http/nginx/DETAILS
index cbb22a6..5507f33 100755
--- a/http/nginx/DETAILS
+++ b/http/nginx/DETAILS
@@ -1,5 +1,6 @@
            SPELL=nginx
          VERSION=0.6.36
+      PATCHLEVEL=1
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://sysoev.ru/$SPELL/$SOURCE
      
SOURCE_HASH=sha512:45d0cfa80ece5c9d256e1fd8aacc6c6b3434d2b15a2a4dac501cc0b9343a7e43ffdaad2fa30c6c016edd02f62aa983ccbed0d718fa29277632839d26c942a522
diff --git a/http/nginx/HISTORY b/http/nginx/HISTORY
index 4148b80..af53331 100644
--- a/http/nginx/HISTORY
+++ b/http/nginx/HISTORY
@@ -1,3 +1,7 @@
+2009-04-25 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: PATCHLEVEL=1
+       * syslog.patch: fixed syslogging for extra error
+
 2009-04-17 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: added ssl module option
 
diff --git a/http/nginx/syslog.patch b/http/nginx/syslog.patch
index 8295e2d..5f636b8 100644
--- a/http/nginx/syslog.patch
+++ b/http/nginx/syslog.patch
@@ -121,8 +121,8 @@
      if (name) {
          full = *name;
  
---- src/core/ngx_log.c.orig    2008-11-20 20:23:08.000000000 +0300
-+++ src/core/ngx_log.c 2009-04-01 17:52:42.969516782 +0400
+--- src/core/ngx_log.c.orig    2009-04-01 20:19:22.000000000 +0400
++++ src/core/ngx_log.c 2009-04-25 19:45:12.992533679 +0400
 @@ -7,6 +7,9 @@
  #include <ngx_config.h>
  #include <ngx_core.h>
@@ -133,19 +133,31 @@
  
  static char *ngx_set_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void 
*conf);
  
-@@ -81,9 +84,11 @@
+@@ -81,17 +84,22 @@
  #endif
      u_char   errstr[NGX_MAX_ERROR_STR], *p, *last;
  
-+    #ifndef USE_SYSLOG
++#ifndef USE_SYSLOG
      if (log->file->fd == NGX_INVALID_FILE) {
          return;
      }
-+    #endif
++#endif
  
      last = errstr + NGX_MAX_ERROR_STR;
  
-@@ -158,7 +163,22 @@
++#ifdef USE_SYSLOG
++    p = errstr;
++#else
+     ngx_memcpy(errstr, ngx_cached_err_log_time.data,
+                ngx_cached_err_log_time.len);
+ 
+     p = errstr + ngx_cached_err_log_time.len;
+-
++#endif
+     p = ngx_snprintf(p, last - p, " [%s] ", err_levels[level]);
+ 
+     /* pid#tid */
+@@ -150,7 +158,22 @@
  
      ngx_linefeed(p);
  
@@ -157,7 +169,7 @@
 +    {
 +        strncpy(syslogstr, errstr, p - errstr);
 +
-+      /* write to syslog */
++        /* write to syslog */
 +        syslog(LOG_CRIT, "%s", syslogstr);
 +
 +        free(syslogstr);
@@ -168,35 +180,24 @@
  }
  
  
-@@ -242,13 +262,17 @@
+@@ -234,6 +257,9 @@
      ngx_log_t  *log;
      ngx_str_t  *value, *name;
  
-+#ifndef USE_SYSLOG
++#ifdef USE_SYSLOG
++    name = value = NULL;
++#else
      if (args) {
          value = args->elts;
          name = &value[1];
- 
+@@ -241,6 +267,7 @@
      } else {
-+#endif
          name = NULL;
-+#ifndef USE_SYSLOG
      }
 +#endif
  
      log = ngx_pcalloc(cycle->pool, sizeof(ngx_log_t));
      if (log == NULL) {
-@@ -325,6 +349,10 @@
- 
-     value = cf->args->elts;
- 
-+#ifdef USE_SYSLOG
-+    value[1].data = "stderr";
-+#endif
-+
-     if (value[1].len == 6 && ngx_strcmp(value[1].data, "stderr") == 0) {
-         cf->cycle->new_log->file->fd = ngx_stderr.fd;
-         cf->cycle->new_log->file->name.len = 0;
 --- src/http/modules/ngx_http_log_module.c.orig        2007-11-15 
15:26:36.000000000 +0100
 +++ src/http/modules/ngx_http_log_module.c     2008-05-16 11:56:39.000000000 
+0200
 @@ -9,6 +9,9 @@