Browse Source

compile fixes for MIPSpro on IRIX

git-svn-id: svn://svn.lighttpd.net/lighttpd/trunk@68 152afb58-edef-0310-8abb-c4023f1b3aa9
svn/tags/release-1.3.12
Jan Kneschke 17 years ago
parent
commit
bde657648d
  1. 8
      src/buffer.c
  2. 2
      src/mod_accesslog.c
  3. 11
      src/mod_compress.c
  4. 2
      src/mod_fastcgi.c
  5. 2
      src/network.c

8
src/buffer.c

@ -914,22 +914,22 @@ int buffer_path_simplify(buffer *dest, buffer *src)
return 0;
}
inline int light_isdigit(int c) {
int light_isdigit(int c) {
return (c >= '0' && c <= '9');
}
inline int light_isxdigit(int c) {
int light_isxdigit(int c) {
if (light_isdigit(c)) return 1;
c |= 32;
return (c >= 'a' && c <= 'f');
}
inline int light_isalpha(int c) {
int light_isalpha(int c) {
c |= 32;
return (c >= 'a' && c <= 'z');
}
inline int light_isalnum(int c) {
int light_isalnum(int c) {
return light_isdigit(c) || light_isalpha(c);
}

2
src/mod_accesslog.c

@ -462,7 +462,7 @@ SETDEFAULTS_FUNC(log_access_open) {
if (pipe(to_log_fds)) {
log_error_write(srv, __FILE__, __LINE__, "ss", "pipe failed: ", strerror(errno));
return -1;
return HANDLER_ERROR;
}
/* fork, execve */

11
src/mod_compress.c

@ -103,7 +103,6 @@ FREE_FUNC(mod_compress_free) {
SETDEFAULTS_FUNC(mod_compress_setdefaults) {
plugin_data *p = p_d;
size_t i = 0;
int ret = HANDLER_GO_ON;
config_values_t cv[] = {
{ "compress.cache-dir", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
@ -128,14 +127,10 @@ SETDEFAULTS_FUNC(mod_compress_setdefaults) {
p->config_storage[i] = s;
if (0 != (ret = config_insert_values_global(srv, ((data_config *)srv->config_context->data[i])->value, cv))) {
ret = HANDLER_ERROR;
break;
if (0 != config_insert_values_global(srv, ((data_config *)srv->config_context->data[i])->value, cv)) {
return HANDLER_ERROR
}
ret = HANDLER_GO_ON;
if (!buffer_is_empty(s->compress_cache_dir)) {
struct stat st;
if (0 != stat(s->compress_cache_dir->ptr, &st)) {
@ -147,7 +142,7 @@ SETDEFAULTS_FUNC(mod_compress_setdefaults) {
}
}
return ret;
return HANDLER_GO_ON;
}

2
src/mod_fastcgi.c

@ -661,7 +661,7 @@ static int fcgi_spawn_connection(server *srv,
servlen = SUN_LEN(&fcgi_addr_un);
#else
/* stevens says: */
servlen = proc->socket - 1 + sizeof(fcgi_addr_un.sun_family);
servlen = proc->socket->used - 1 + sizeof(fcgi_addr_un.sun_family);
#endif
socket_type = AF_UNIX;
fcgi_addr = (struct sockaddr *) &fcgi_addr_un;

2
src/network.c

@ -39,7 +39,7 @@ handler_t network_server_handle_fdevent(void *s, void *context, int revents) {
"strange event for server socket",
srv_socket->fd,
revents);
return -1;
return HANDLER_ERROR;
}
while (NULL != (con = connection_accept(srv, srv_socket))) {

Loading…
Cancel
Save