Browse Source

PACKAGE -> PACKAGE_NAME (by smi)

git-svn-id: svn://svn.lighttpd.net/lighttpd/trunk@67 152afb58-edef-0310-8abb-c4023f1b3aa9
svn/tags/release-1.3.12
Jan Kneschke 17 years ago
parent
commit
0cccf378c7
  1. 4
      src/mod_cgi.c
  2. 4
      src/mod_ssi.c
  3. 2
      src/mod_status.c
  4. 4
      src/response.c
  5. 4
      src/server.c
  6. 4
      src/spawn-fcgi.c

4
src/mod_cgi.c

@ -742,11 +742,7 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer *
env.size = 0;
env.used = 0;
#ifdef PACKAGE_NAME
cgi_env_add(&env, CONST_STR_LEN("SERVER_SOFTWARE"), PACKAGE_NAME"/"PACKAGE_VERSION);
#else
cgi_env_add(&env, CONST_STR_LEN("SERVER_SOFTWARE"), PACKAGE"/"VERSION);
#endif
cgi_env_add(&env, CONST_STR_LEN("SERVER_NAME"),
con->server_name->used ?
con->server_name->ptr :

4
src/mod_ssi.c

@ -198,11 +198,7 @@ static int build_ssi_cgi_vars(server *srv, connection *con, plugin_data *p) {
array_reset(p->ssi_cgi_env);
#ifdef PACKAGE_NAME
ssi_env_add(p->ssi_cgi_env, CONST_STRING("SERVER_SOFTWARE"), PACKAGE_NAME"/"PACKAGE_VERSION);
#else
ssi_env_add(p->ssi_cgi_env, CONST_STRING("SERVER_SOFTWARE"), PACKAGE"/"VERSION);
#endif
ssi_env_add(p->ssi_cgi_env, CONST_STRING("SERVER_NAME"),
#ifdef HAVE_IPV6
inet_ntop(srv_sock->addr.plain.sa_family,

2
src/mod_status.c

@ -471,7 +471,7 @@ static handler_t mod_status_handle_server_config(server *srv, connection *con, v
" <title>Status</title>\n"
" </head>\n"
" <body>\n"
" <h1>"PACKAGE_NAME" "PACKAGE_VERSION"</h1>\n"
" <h1>" PACKAGE_NAME " " PACKAGE_VERSION "</h1>\n"
" <table border=\"1\">\n");
mod_status_header_append(b, "Server-Features");

4
src/response.c

@ -98,7 +98,7 @@ int http_response_write_basic_header(server *srv, connection *con) {
}
if (buffer_is_empty(con->conf.server_tag)) {
BUFFER_APPEND_STRING_CONST(b, "\r\nServer: "PACKAGE"/"VERSION);
BUFFER_APPEND_STRING_CONST(b, "\r\nServer: " PACKAGE_NAME "/" PACKAGE_VERSION);
} else {
BUFFER_APPEND_STRING_CONST(b, "\r\nServer: ");
buffer_append_string_buffer(b, con->conf.server_tag);
@ -232,7 +232,7 @@ int http_response_write_header(server *srv, connection *con,
}
if (buffer_is_empty(con->conf.server_tag)) {
BUFFER_APPEND_STRING_CONST(b, "\r\nServer: "PACKAGE"/"VERSION);
BUFFER_APPEND_STRING_CONST(b, "\r\nServer: " PACKAGE_NAME "/" PACKAGE_VERSION);
} else {
BUFFER_APPEND_STRING_CONST(b, "\r\nServer: ");
buffer_append_string_buffer(b, con->conf.server_tag);

4
src/server.c

@ -272,7 +272,7 @@ static void show_version (void) {
#else
# define TEXT_SSL
#endif
char *b = PACKAGE "-" VERSION TEXT_SSL \
char *b = PACKAGE_NAME "-" PACKAGE_VERSION TEXT_SSL \
" - a light and fast webserver\n" \
"Build-Date: " __DATE__ " " __TIME__ "\n";
;
@ -291,7 +291,7 @@ static void show_help (void) {
#else
# define TEXT_IPV6
#endif
char *b = PACKAGE "-" VERSION TEXT_SSL " ("__DATE__ " " __TIME__ ")" \
char *b = PACKAGE_NAME "-" PACKAGE_VERSION TEXT_SSL " ("__DATE__ " " __TIME__ ")" \
" - a light and fast webserver\n" \
"usage:\n" \
" -f <name> filename of the config-file\n" \

4
src/spawn-fcgi.c

@ -193,7 +193,7 @@ int fcgi_spawn_connection(char *appPath, unsigned short port, const char *unixso
void show_version () {
char *b = "spawn-fcgi" "-" VERSION \
char *b = "spawn-fcgi" "-" PACKAGE_VERSION \
" - spawns fastcgi processes\n" \
"Build-Date: " __DATE__ " " __TIME__ "\n";
;
@ -201,7 +201,7 @@ void show_version () {
}
void show_help () {
char *b = "spawn-fcgi" "-" VERSION \
char *b = "spawn-fcgi" "-" PACKAGE_VERSION \
" - spawns fastcgi processes\n" \
"usage:\n" \
" -f <fcgiapp> filename of the fcgi-application\n" \

Loading…
Cancel
Save