~ubuntu-branches/ubuntu/natty/lighttpd/natty

« back to all changes in this revision

Viewing changes to src/configfile-glue.c

Committer: Bazaar Package Importer
Author(s): Krzysztof Krzyżaniak (eloy)
Date: 2009-10-30 17:37:29 UTC
mto: (6.1.4 squeeze)
mto: This revision was merged to the branch mainline in revision 50.
Revision ID: james.westby@ubuntu.com-20091030173729-ehmsdiba9nkcd0j7

Tags: upstream-1.4.24

Import upstream version 1.4.24

files added:
m4

m4/libtool.m4

m4/ltoptions.m4

m4/ltsugar.m4

m4/ltversion.m4

m4/lt~obsolete.m4

tests/docroot/www/sendfile.php

files removed:
ChangeLog

files modified:
Makefile.am

Makefile.in

NEWS

SConstruct

aclocal.m4

autogen.sh

compile

config.guess

config.h.in

config.sub

configure

configure.ac

depcomp

doc/Makefile.in

doc/fastcgi.txt

install-sh

missing

src/Makefile.am

src/Makefile.in

src/array.c

src/array.h

src/base.h

src/bitset.c

src/buffer.c

src/buffer.h

src/chunk.c

src/configfile-glue.c

src/configfile.c

src/configparser.c

src/configparser.y

src/connections.c

src/crc32.h

src/data_array.c

src/data_config.c

src/data_count.c

src/data_fastcgi.c

src/data_integer.c

src/data_string.c

src/etag.c

src/etag.h

src/fdevent.c

src/fdevent.h

src/fdevent_freebsd_kqueue.c

src/fdevent_linux_rtsig.c

src/fdevent_linux_sysepoll.c

src/fdevent_poll.c

src/fdevent_select.c

src/fdevent_solaris_devpoll.c

src/http-header-glue.c

src/http_auth.c

src/http_auth_digest.c

src/http_auth_digest.h

src/http_chunk.c

src/inet_ntop_cache.c

src/joblist.c

src/keyvalue.c

src/keyvalue.h

src/lemon.c

src/log.c

src/md5.c

src/mod_access.c

src/mod_accesslog.c

src/mod_alias.c

src/mod_auth.c

src/mod_cgi.c

src/mod_cml.c

src/mod_cml_funcs.c

src/mod_cml_funcs.h

src/mod_cml_lua.c

src/mod_compress.c

src/mod_dirlisting.c

src/mod_evasive.c

src/mod_evhost.c

src/mod_expire.c

src/mod_extforward.c

src/mod_fastcgi.c

src/mod_flv_streaming.c

src/mod_indexfile.c

src/mod_magnet.c

src/mod_magnet_cache.c

src/mod_mysql_vhost.c

src/mod_proxy.c

src/mod_redirect.c

src/mod_rewrite.c

src/mod_rrdtool.c

src/mod_scgi.c

src/mod_secure_download.c

src/mod_setenv.c

src/mod_simple_vhost.c

src/mod_skeleton.c

src/mod_ssi.c

src/mod_ssi_expr.c

src/mod_ssi_exprparser.c

src/mod_ssi_exprparser.y

src/mod_staticfile.c

src/mod_status.c

src/mod_trigger_b4_dl.c

src/mod_userdir.c

src/mod_usertrack.c

src/mod_webdav.c

src/network.c

src/network_backends.h

src/network_freebsd_sendfile.c

src/network_linux_sendfile.c

src/network_openssl.c

src/network_solaris_sendfilev.c

src/network_write.c

src/network_writev.c

src/plugin.c

src/proc_open.c

src/request.c

src/response.c

src/response.h

src/server.c

src/settings.h

src/splaytree.c

src/stat_cache.c

src/status_counter.c

src/status_counter.h

src/stream.c

src/version.h

tests/404-handler.conf

tests/LightyTest.pm

tests/Makefile.in

tests/bug-06.conf

tests/bug-12.conf

tests/condition.conf

tests/docroot/123/Makefile.in

tests/docroot/Makefile.in

tests/docroot/www/Makefile.am

tests/docroot/www/Makefile.in

tests/docroot/www/expire/Makefile.in

tests/docroot/www/go/Makefile.in

tests/docroot/www/indexfile/Makefile.in

tests/fastcgi-10.conf

tests/fastcgi-13.conf

tests/fastcgi-auth.conf

tests/fastcgi-responder.conf

tests/lighttpd.conf

tests/lowercase.conf

tests/mod-compress.conf

tests/mod-compress.t

tests/mod-fastcgi.t

tests/mod-rewrite.t

tests/proxy.conf

tests/run-tests.pl

tests/var-include.conf

Show diffs side-by-side

added added

removed removed

src/configfile-glue.c

#include <string.h>

#include <stdlib.h>

#include "base.h"

#include "buffer.h"

#include "array.h"

#include "configfile.h"

#include <string.h>

#include <stdlib.h>

/**

* like all glue code this file contains functions which

* are the external interface of lighttpd. The functions

103

if (e != ds->value->ptr && !*e && l >=0 && l <= 65535) {

104

*((unsigned short *)(cv[i].destination)) = l;

105

break;

106

107

106

}

108

107

}

109

108

112

111

return -1;

113

112

}

114

113

default:

115

log_error_write(srv, __FILE__, __LINE__, "ssds", "unexpected type for key:", cv[i].key, du->type, "expected a integer, range 0 ... 65535");

114

log_error_write(srv, __FILE__, __LINE__, "ssds", "unexpected type for key:", cv[i].key, du->type, "expected a short integer, range 0 ... 65535");

115

return -1;

116

}

117

break;

118

case T_CONFIG_INT:

119

switch(du->type) {

120

case TYPE_INTEGER: {

121

data_integer *di = (data_integer *)du;

122

123

*((unsigned int *)(cv[i].destination)) = di->value;

124

break;

125

}

126

case TYPE_STRING: {

127

data_string *ds = (data_string *)du;

128

129

if (ds->value->ptr && *ds->value->ptr) {

130

char *e;

131

long l = strtol(ds->value->ptr, &e, 10);

132

if (e != ds->value->ptr && !*e && l >= 0) {

133

*((unsigned int *)(cv[i].destination)) = l;

134

break;

135

}

136

}

137

138

139

log_error_write(srv, __FILE__, __LINE__, "ssb", "got a string but expected an integer:", cv[i].key, ds->value);

140

141

return -1;

142

}

143

default:

144

log_error_write(srv, __FILE__, __LINE__, "ssds", "unexpected type for key:", cv[i].key, du->type, "expected an integer, range 0 ... 4294967295");

116

145

return -1;

117

146

}

118

147

break;

289

318

default:

290

319

break;

291

320

}

321

#if defined USE_OPENSSL && ! defined OPENSSL_NO_TLSEXT

322

} else if (!buffer_is_empty(con->tlsext_server_name)) {

323

l = con->tlsext_server_name;

324

#endif

292

325

} else {

293

326

l = srv->empty_string;

294

327

}

Older »