Changeset 034113 for server/src/http/modules/ngx_http_memcached_module.c

Timestamp:

02/19/08 19:54:43 (4 years ago)

Author:

Tomash Brechko <tomash.brechko@…>

Branches:

master-v0.7, master-v0.6, upstream_count_limit

Children:

f9e584

Parents:

c79fa6 (diff), b3076c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Tomash Brechko <tomash.brechko@…> (02/19/08 19:54:43)

git-committer:

Tomash Brechko <tomash.brechko@…> (02/19/08 19:54:43)

Message:

Merge branch 'memcached_gzip'

File:

• server/src/http/modules/ngx_http_memcached_module.c (modified) (1 diff)

server/src/http/modules/ngx_http_memcached_module.c

@@ -103 +103 @@
 
     { ngx_string("memcached_gzip_flag"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                        |NGX_CONF_TAKE1,
       ngx_conf_set_num_slot,
       NGX_HTTP_LOC_CONF_OFFSET,