src/nginx_module/ContentHandler.c in passenger-5.0.20 vs src/nginx_module/ContentHandler.c in passenger-5.0.21

@@ -1,9 +1,9 @@
 /*
  * Copyright (C) Igor Sysoev
  * Copyright (C) 2007 Manlio Perillo ([e-mail])
- * Copyright (C) 2010-2015 Phusion
+ * Copyright (c) 2010-2015 Phusion Holding B.V.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
@@ -220,12 +220,12 @@
      * socket filename.
      */
     if (address->name.data == pp_placeholder_upstream_address.data) {
         sockaddr = (struct sockaddr_un *) address->sockaddr;
         core_address =
-            pp_agents_starter_get_core_address(pp_agents_starter,
-                                               &core_address_len);
+            psg_watchdog_launcher_get_core_address(psg_watchdog_launcher,
+                                                   &core_address_len);
         core_address += sizeof("unix:") - 1;
         core_address_len -= sizeof("unix:") - 1;
 
         address->name.data = (u_char *) core_address;
         address->name.len  = core_address_len;
@@ -256,12 +256,12 @@
     }
 
     rrp        = r->upstream->peer.data;
     peers      = rrp->peers;
     core_address =
-        pp_agents_starter_get_core_address(pp_agents_starter,
-                                             &core_address_len);
+        psg_watchdog_launcher_get_core_address(psg_watchdog_launcher,
+                                               &core_address_len);
 
     while (peers != NULL) {
         if (peers->name) {
             if (peers->name->data == (u_char *) core_address) {
                 /* Peer names already fixed. */
@@ -446,11 +446,11 @@
         state->content_length.len = ngx_snprintf(state->content_length.data,
             sizeof("4294967295") - 1, "%O", r->headers_in.content_length_n)
             - state->content_length.data;
     }
 
-    state->core_password.data = (u_char *) pp_agents_starter_get_core_password(
-        pp_agents_starter, &len);
+    state->core_password.data = (u_char *) psg_watchdog_launcher_get_core_password(
+        psg_watchdog_launcher, &len);
     state->core_password.len  = len;
 
     switch (r->connection->sockaddr->sa_family) {
     #if (NGX_HAVE_INET6)
     case AF_INET6: