0
@@ -566,9 +566,18 @@ init_module(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *
0
    * good hooks that we can use to avoid double initialization.
0
    *
0
    * So as a hack, we check whether Apache has already been daemonized, by checking
0
-	 * whether ppid() returns 1.
0
+	 * whether ppid() returns 1. This doesn't work with Apache 2.0.x though: ppid()
0
+	 * doesn't return 1. So Apache 2.0.x users will just have to live with the double
0
+	 * initialization overhead.
0
    */
0
-	if (getppid() == 1 || ap_exists_config_define("DEBUG")) {
0
+	bool passengerShouldBeInitialized;
0
+	
0
+	#if (AP_SERVER_MAJORVERSION_NUMBER == 2 && AP_SERVER_MINORVERSION_NUMBER >= 2) || AP_SERVER_MAJORVERSION_NUMBER > 2
0
+		passengerShouldBeInitialized = getppid() == 1 || ap_exists_config_define("DEBUG");
0
+	#else
0
+		passengerShouldBeInitialized = true;
0
+	#endif
0
+	if (passengerShouldBeInitialized) {
0
     try {
0
       hooks = new Hooks(pconf, plog, ptemp, s);
0
       apr_pool_cleanup_register(pconf, NULL,
0
@@ -663,3 +672,4 @@ passenger_register_hooks(apr_pool_t *p) {
0
 /**
0
  * @}
0
  */
0
+