public
Description: Phusion Passenger (mod_rails)
Homepage: http://www.modrails.com/
Clone URL: git://github.com/FooBarWidget/passenger.git
Click here to lend your support to: passenger and make a donation at www.pledgie.com !
The framework spawner timeout argument is accidentally swapped with the 
app spawner timeout argument. Fix this.
Hongli Lai (Phusion) (author)
Fri Aug 08 14:35:55 -0700 2008
commit  a7e91f91d34e8aa17ffb47137f8b1bc23dcab41b
tree    f3eba734637105d45e91660f72e213811375ba02
parent  b697035d9de704f0160f6aef18a3d431316192a8
...
576
577
578
579
 
580
581
582
...
576
577
578
 
579
580
581
582
0
@@ -576,7 +576,7 @@ const command_rec passenger_commands[] = {
0
     (Take1Func) cmd_rails_framework_spawner_idle_time,
0
     NULL,
0
     RSRC_CONF,
0
- "The maximum number of seconds that an application spawner may be idle before it is shutdown."),
0
+ "The maximum number of seconds that a framework spawner may be idle before it is shutdown."),
0
   AP_INIT_TAKE1("RailsAppSpawnerIdleTime", // TODO: document this
0
     (Take1Func) cmd_rails_app_spawner_idle_time,
0
     NULL,
...
394
395
396
397
398
 
399
400
401
...
394
395
396
 
397
398
399
400
401
0
@@ -394,8 +394,8 @@ private:
0
           mapper.getEnvironment(),
0
           config->getSpawnMethodString(),
0
           mapper.getApplicationTypeString(),
0
- config->appSpawnerTimeout,
0
           config->frameworkSpawnerTimeout,
0
+ config->appSpawnerTimeout,
0
           config->getMaxRequests(),
0
           config->getMemoryLimit()));
0
         P_TRACE(3, "Forwarding " << r->uri << " to PID " << session->getPid());
...
197
198
199
200
201
 
 
202
203
204
...
197
198
199
 
 
200
201
202
203
204
0
@@ -197,8 +197,8 @@ struct SpawnOptions {
0
    * as a message to be sent to the spawn server.
0
    */
0
   void toVector(vector<string> &vec) const {
0
- if (vec.capacity() < vec.size() + 9) {
0
- vec.reserve(vec.size() + 9);
0
+ if (vec.capacity() < vec.size() + 10) {
0
+ vec.reserve(vec.size() + 10);
0
     }
0
     appendKeyValue (vec, "app_root", appRoot);
0
     appendKeyValue (vec, "lower_privilege", lowerPrivilege ? "true" : "false");

Comments

    No one has commented yet.