Merge branch 'master' of github.com:slact/nginx_http_push_module

README

@@ -143,14 +143,14 @@ http {
 
 ---------------------------- Operation ---------------------------------------
 Assuming the example config given above:
-Clients will connect to http://example.com/listen?id=... and have the 
-response delayed until a message is POSTed to http://example.com/send?id=...
+Clients will connect to http://example.com/activity?id=... and have the 
+response delayed until a message is POSTed to http://example.com/publish?id=...
 Messages can be sent to clients that have not yet connected, i.e. they are 
 queued.
 
 Upon sending a request to a push_publisher location, the server will respond with 
 a 201 Created if the message has been sent. If it must be queued up (i.e. the 
-push_subscriber with this id is presently connected), a 202 Accepted will be sent.
+push_subscriber with this id is not presently connected), a 202 Accepted will be sent.
 
 If you intend to have the publisher be a server-side application, 
 it's a damn good idea to make sure the push_publisher location is not visible

src/ngx_http_push_module_setup.c

@@ -122,7 +122,7 @@ static char *	ngx_http_push_merge_loc_conf(ngx_conf_t *cf, void *parent, void *c
 	//sanity checks
 	if(conf->max_messages < conf->min_messages) {
 		//min/max buffer size makes sense?
-		ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "push_max_message_buffer_length cannot be smaller than push_max_message_buffer_length.");
+		ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "push_max_message_buffer_length cannot be smaller than push_min_message_buffer_length.");
 		return NGX_CONF_ERROR;
 	}