Permalink
Browse files

fixed source lines exceeding 80 cols and also updated README to refle…

…ct recent changes.
  • Loading branch information...
1 parent 8a5cd31 commit c752861c45b776d04e97b2a11a1e7be320a31184 @agentzh agentzh committed Jan 12, 2012
Showing with 33 additions and 30 deletions.
  1. +12 −10 README
  2. +21 −20 src/ngx_http_encrypted_session_module.c
View
22 README
@@ -100,36 +100,38 @@ Directives
set_decrypt_session
Installation
- 1. Grab the nginx source code from nginx.net (<http://nginx.net/ >), for
- example, the version 0.8.53 (see nginx compatibility),
+ 1. Grab the nginx source code from nginx.org (<http://nginx.org/ >), for
+ example, the version 1.0.11 (see nginx compatibility),
2. Grab the NDK module from GitHub:
- http://github.com/simpl-it/ngx_devel_kit
+ http://github.com/simpl/ngx_devel_kit
3. and then build the source with this module:
- $ wget 'http://sysoev.ru/nginx/nginx-0.8.53.tar.gz'
- $ tar -xzvf nginx-0.8.53.tar.gz
- $ cd nginx-0.8.53/
+ wget 'http://nginx.org/download/nginx-1.0.11.tar.gz'
+ tar -xzvf nginx-1.0.11.tar.gz
+ cd nginx-1.0.11/
# Here we assume you would install you nginx under /opt/nginx/.
- $ ./configure --prefix=/opt/nginx \
+ ./configure --prefix=/opt/nginx \
--add-module=/path/to/ngx_devel_kit \
--add-module=/path/to/encrypted-session-nginx-module
- $ make -j2
- $ make install
+ make
+ make install
Download the latest version of the release tarball of this module from
encrypted-session-nginx-module file list
(<http://github.com/agentzh/encrypted-session-nginx-module/tags >).
+ OpenSSL should not be disabled in your Nginx build.
+
Compatibility
The following versions of Nginx should work with this module:
* 1.1.x (last tested: 1.1.5)
- * 1.0.x (last tested: 1.0.8)
+ * 1.0.x (last tested: 1.0.11)
* 0.9.x (last tested: 0.9.4)
@@ -18,20 +18,20 @@ typedef struct {
static ngx_int_t ngx_http_set_encode_encrypted_session(ngx_http_request_t *r,
- ngx_str_t *res, ngx_http_variable_value_t *v);
+ ngx_str_t *res, ngx_http_variable_value_t *v);
static ngx_int_t ngx_http_set_decode_encrypted_session(ngx_http_request_t *r,
- ngx_str_t *res, ngx_http_variable_value_t *v);
+ ngx_str_t *res, ngx_http_variable_value_t *v);
static char * ngx_http_encrypted_session_key(ngx_conf_t *cf, ngx_command_t *cmd,
- void *conf);
+ void *conf);
static char * ngx_http_encrypted_session_iv(ngx_conf_t *cf, ngx_command_t *cmd,
- void *conf);
+ void *conf);
-static char * ngx_http_encrypted_session_expires(ngx_conf_t *cf, ngx_command_t *cmd,
- void *conf);
+static char * ngx_http_encrypted_session_expires(ngx_conf_t *cf,
+ ngx_command_t *cmd, void *conf);
static void *ngx_http_encrypted_session_create_conf(ngx_conf_t *cf);
@@ -107,17 +107,17 @@ static ngx_command_t ngx_http_encrypted_session_commands[] = {
static ngx_http_module_t ngx_http_encrypted_session_module_ctx = {
- NULL, /* preconfiguration */
- NULL, /* postconfiguration */
+ NULL, /* preconfiguration */
+ NULL, /* postconfiguration */
- NULL, /* create main configuration */
- NULL, /* init main configuration */
+ NULL, /* create main configuration */
+ NULL, /* init main configuration */
- NULL, /* create server configuration */
- NULL, /* merge server configuration */
+ NULL, /* create server configuration */
+ NULL, /* merge server configuration */
- ngx_http_encrypted_session_create_conf, /* create location configuration */
- ngx_http_encrypted_session_merge_conf, /* merge location configuration */
+ ngx_http_encrypted_session_create_conf, /* create location configuration */
+ ngx_http_encrypted_session_merge_conf, /* merge location configuration */
};
@@ -157,8 +157,8 @@ ngx_http_set_encode_encrypted_session(ngx_http_request_t *r,
return NGX_ERROR;
}
- rc = ngx_http_encrypted_session_3des_mac_encrypt(r->pool, r->connection->log,
- conf->iv, ngx_http_encrypted_session_iv_length,
+ rc = ngx_http_encrypted_session_3des_mac_encrypt(r->pool,
+ r->connection->log, conf->iv, ngx_http_encrypted_session_iv_length,
conf->key, ngx_http_encrypted_session_key_length,
v->data, v->len, conf->expires, &dst, &len);
@@ -197,8 +197,8 @@ ngx_http_set_decode_encrypted_session(ngx_http_request_t *r,
return NGX_ERROR;
}
- rc = ngx_http_encrypted_session_3des_mac_decrypt(r->pool, r->connection->log,
- conf->iv, ngx_http_encrypted_session_iv_length,
+ rc = ngx_http_encrypted_session_3des_mac_decrypt(r->pool,
+ r->connection->log, conf->iv, ngx_http_encrypted_session_iv_length,
conf->key, ngx_http_encrypted_session_key_length,
v->data, v->len, &dst, &len);
@@ -280,9 +280,10 @@ ngx_http_encrypted_session_iv(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
static char *
-ngx_http_encrypted_session_expires(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+ngx_http_encrypted_session_expires(ngx_conf_t *cf, ngx_command_t *cmd,
+ void *conf)
{
- ngx_str_t *value;
+ ngx_str_t *value;
ngx_http_encrypted_session_conf_t *llcf = conf;
if (llcf->expires != NGX_CONF_UNSET) {

0 comments on commit c752861

Please sign in to comment.