ext/common/AgentsStarter.cpp in passenger-5.0.10 vs ext/common/AgentsStarter.cpp in passenger-5.0.11

- old
+ new

@@ -1,8 +1,8 @@ /* * Phusion Passenger - https://www.phusionpassenger.com/ - * Copyright (c) 2010-2014 Phusion + * Copyright (c) 2010-2015 Phusion * * "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -135,24 +135,24 @@ return 0; } } const char * -pp_agents_starter_get_server_address(PP_AgentsStarter *as, unsigned int *size) { +pp_agents_starter_get_core_address(PP_AgentsStarter *as, unsigned int *size) { Passenger::AgentsStarter *agentsStarter = (Passenger::AgentsStarter *) as; if (size != NULL) { - *size = agentsStarter->getServerAddress().size(); + *size = agentsStarter->getCoreAddress().size(); } - return agentsStarter->getServerAddress().c_str(); + return agentsStarter->getCoreAddress().c_str(); } const char * -pp_agents_starter_get_server_password(PP_AgentsStarter *as, unsigned int *size) { +pp_agents_starter_get_core_password(PP_AgentsStarter *as, unsigned int *size) { Passenger::AgentsStarter *agentsStarter = (Passenger::AgentsStarter *) as; if (size != NULL) { - *size = agentsStarter->getServerPassword().size(); + *size = agentsStarter->getCorePassword().size(); } - return agentsStarter->getServerPassword().c_str(); + return agentsStarter->getCorePassword().c_str(); } const char * pp_agents_starter_get_instance_dir(PP_AgentsStarter *as, unsigned int *size) { Passenger::AgentsStarter *agentsStarter = (Passenger::AgentsStarter *) as;