nginx-0.1.14-RELEASE importrelease-0.1.14

    *) Feature: the autoconfiguration directives:
       --http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
       --http-fastcgi-temp-path=PATH

    *) Change: the directory name for the temporary files with the client
       request body is specified by directive client_body_temp_path, by
       default it is <prefix>/client_body_temp.

    *) Feature: the ngx_http_fastcgi_module and the directives:
       fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
       fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
       fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
       fastcgi_busy_buffers_size, fastcgi_temp_path,
       fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
       fastcgi_next_upstream, and fastcgi_x_powered_by.

    *) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
       0.1.3.

    *) Change: the URI must be specified after the host name in the
       proxy_pass directive.

    *) Change: the %3F symbol in the URI was considered as the argument
       string start.

    *) Feature: the unix domain sockets support in the
       ngx_http_proxy_module.

    *) Feature: the ssl_engine and ssl_ciphers directives.
       Thanks to Sergey Skvortsov for SSL-accelerator.

1 files changed, 23 insertions, 19 deletions

diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
index 51a1b47e2..e80824b30 100644
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -9,42 +9,46 @@
 #include <ngx_http.h>
 
 
-char *ngx_http_script_copy(ngx_http_request_t *r,
-                           ngx_http_script_code_t *code,
-                           char *p, size_t len)
+u_char *ngx_http_script_copy(ngx_http_request_t *r, u_char *buf, void *data)
 {
-    return ngx_cpymem(p, code->offset, code->len < len ? code->len : len);
+    u_char  **p = data;
+
+    ngx_http_script_code_t  *code;
+
+    code = (ngx_http_script_code_t *)
+                              ((char *) data - sizeof(ngx_http_script_code_t));
+
+    return ngx_cpymem(buf, *p, code->data_len);
 }
 
 
-char *ngx_http_script_header_in(ngx_http_request_t *r,
-                                ngx_http_script_code_t *code,
-                                char *p, size_t len)
+u_char *ngx_http_script_header_in(ngx_http_request_t *r,
+                                  u_char *buf, void *data)
 {
-    ngx_str_t *s;
+    size_t  *offset = data;
 
-    s = (ngx_str_t *) (((char *) r->headers_in) + code->offset);
+    ngx_table_elt_t  *h;
 
-    return ngx_cpymem(p, s->data, s->len < len ? s->len : len);
-}
+    h = *(ngx_table_elt_t **) (((char *) r->headers_in) + *offset);
 
+    return ngx_cpymem(p, h->value.data, h->value.len);
+}
 
-/* the log script codes */
 
-char *ngx_http_script_request_line(ngx_http_request_t *r, char *p, size_t len)
+u_char *ngx_http_script_request_line(ngx_http_request_t *r,
+                                     u_char *buf, void *data)
 {
-    return ngx_cpymem(p, r->request_line.data,
-                      r->request_line.len < len ? r->request_line.len : len);
+    return ngx_cpymem(p, r->request_line.data, r->request_line.len);
 }
 
 
-char *ngx_http_script_status(ngx_http_request_t *r, char *p, size_t len)
+u_char *ngx_http_script_status(ngx_http_request_t *r, u_char *buf, void *data)
 {
-    return ngx_snprintf(p, len, "%d", r->headers_out.status);
+    return ngx_sprintf(buf, "%ui", r->headers_out.status);
 }
 
 
-char *ngx_http_script_sent(ngx_http_request_t *r, char *p, size_t len)
+u_char *ngx_http_script_sent(ngx_http_request_t *r, u_char *buf, void *data)
 {
-    return ngx_sprintf(p, "%O", r->connection->sent);
+    return ngx_sprintf(buf, "%O", r->connection->sent);
 }