cherokee at cherokee-project
Oct 30, 2009, 9:22 AM
Post #1 of 1
(33 views)
Permalink
|
|
[3763] cherokee/trunk/cherokee/main_worker.c: The -r and -p parameters can only be user together.
|
|
Revision: 3763
http://svn.cherokee-project.com/changeset/3763
Author: alo
Date: 2009-10-30 17:22:30 +0100 (Fri, 30 Oct 2009)
Log Message:
-----------
The -r and -p parameters can only be user together. Fixes:
http://bugs.cherokee-project.com/588
Modified Paths:
--------------
cherokee/trunk/cherokee/main_worker.c
Modified: cherokee/trunk/cherokee/main_worker.c
===================================================================
--- cherokee/trunk/cherokee/main_worker.c 2009-10-30 16:18:35 UTC (rev 3762)
+++ cherokee/trunk/cherokee/main_worker.c 2009-10-30 16:22:30 UTC (rev 3763)
@@ -83,6 +83,7 @@
static cherokee_boolean_t daemon_mode = false;
static cherokee_boolean_t just_test = false;
static cherokee_boolean_t print_modules = false;
+static cherokee_boolean_t port_set = false;
static cuint_t port = 80;
static ret_t common_server_initialization (cherokee_server_t *srv);
@@ -229,6 +230,12 @@
} else {
const char *config;
+
+ /* Check parameter inconsistencies */
+ if (port_set) {
+ PRINT_MSG ("The -p parameter can only be used in conjunction with -r.");
+ return ret_error;
+ }
/* Read the configuration file
*/
@@ -300,6 +307,7 @@
break;
case 'p':
port = atoi(optarg);
+ port_set = true;
break;
case 't':
just_test = true;
|
