Changeset 1542

Timestamp:

06/12/08 18:31:22 (7 months ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/cherokee/main.c (modified) (3 diffs)

cherokee/trunk/ChangeLog

@@ -1 +1 @@
-2008-06-12  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * cherokee/main.c (common_server_initialization): Added a check to
+        ensure that the TCP port is within the limits. It fixes:
+        http://code.google.com/p/cherokee/issues/detail?id=43
-
-        * configure.in: Fixes an issue with the license notice. Reported

cherokee/trunk/cherokee/main.c

@@ -153 +153 @@
-                cherokee_buffer_t tmp = CHEROKEE_BUF_INIT;
-
+                /* Sanity check
+                 */
+                if (port > 0xFFFF) {
+                        PRINT_ERROR ("Port %d is out of limits\n", port);
+                        return ret_error;
+                }
+
+                /* Build the configuration string
+                 */
-                cherokee_buffer_add_va (&tmp, 
-                                        "server!port = %d\n"
@@ -158 +167 @@
-                                        BASIC_CONFIG, port, document_root);
-
+                /* Apply it
+                 */
-                ret = cherokee_server_read_config_string (srv, &tmp);
-                cherokee_buffer_mrproper (&tmp);
@@ -168 +179 @@
-        } else {
-                char *config;
-
+
+
+
-                config = (config_file) ? config_file : DEFAULT_CONFIG_FILE;
-                ret = cherokee_server_read_config_file (srv, config);