Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Clean up: Trims trailing spaces.

git-svn-id: svn://cherokee-project.com/cherokee/trunk@3999 5dc97367-97f1-0310-9951-d761b3857238
  • Loading branch information...
commit 64fd649c931bdf8f6f76c815c9b891ced1c2aff5 1 parent 0cb28be
taher authored
Showing with 180 additions and 180 deletions.
  1. +1 −1  Makefile.am
  2. +1 −1  cget/Makefile.am
  3. +19 −19 cget/main.c
  4. +1 −1  cget/proxy.c
  5. +1 −1  cget/proxy.h
  6. +52 −52 cherokee/Makefile.am
  7. +1 −1  cherokee/pcre/pcre.h
  8. +5 −5 cherokee/zlib/deflate.c
  9. +2 −2 cherokee/zlib/deftree.c
  10. +5 −5 cherokee/zlib/defutil.h
  11. +1 −1  cherokee/zlib/zconf.h
  12. +9 −9 cherokee/zlib/zlib.h
  13. +32 −32 contrib/05to06.py
  14. +5 −5 contrib/06to07.py
  15. +3 −3 contrib/07to08.py
  16. +4 −4 contrib/08to09.py
  17. +1 −1  contrib/0999to09910.py
  18. +1 −1  contrib/bin2buffer.py
  19. +2 −2 contrib/tracelor.py
  20. +1 −1  doc/Makefile.am
  21. +1 −1  doc/basics_download.txt
  22. +2 −2 doc/cookbook_django.txt
  23. +1 −1  doc/cookbook_mailman.txt
  24. +4 −4 doc/cookbook_nagios.txt
  25. +1 −1  doc/cookbook_streaming.txt
  26. +1 −1  doc/modules_handlers_common.txt
  27. +1 −1  doc/modules_handlers_dbslayer.txt
  28. +1 −1  doc/modules_handlers_dirlist.txt
  29. +1 −1  doc/modules_handlers_secdownload.txt
  30. +4 −4 doc/modules_validators_ldap.txt
  31. +1 −1  doc/modules_validators_mysql.txt
  32. +3 −3 icons/README.txt
  33. +5 −5 packages/osx/build.py
  34. +1 −1  packages/osx/utils.py
  35. +1 −1  po/admin/generate_POTFILESin.py
  36. +3 −3 svnlog2changelog.py
  37. +2 −2 www/Makefile.am
View
2  Makefile.am
@@ -48,7 +48,7 @@ CONFS = \
$(CONFS_PRE:.sample.pre=.sample)
XMLS_PRE = \
-http-cherokee.xml.pre
+http-cherokee.xml.pre
XMLS = \
$(XMLS_PRE:.xml.pre=.xml)
View
2  cget/Makefile.am
@@ -10,7 +10,7 @@ bin_PROGRAMS = cget
cget_LDADD = \
$(PTHREAD_LIBS) \
../cherokee/libcherokee-base.la \
-../cherokee/libcherokee-client.la
+../cherokee/libcherokee-client.la
cget_SOURCES = \
main.c \
View
38 cget/main.c
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
- */
+ */
#include "common-internal.h"
@@ -42,7 +42,7 @@
#ifdef HAVE_GETOPT_LONG
# include <getopt.h>
-#else
+#else
# include "getopt/getopt.h"
#endif
@@ -120,9 +120,9 @@ print_tuple_str (const char *title, const char *info)
int whites;
char *tmp;
- if (quiet == true)
+ if (quiet == true)
return;
-
+
whites = COLUM_NUM - strlen(title);
fprintf (stderr, "%s ", title);
@@ -143,8 +143,8 @@ static void
print_tuple_int (const char *title, int num)
{
char tmp[128];
-
- snprintf (tmp, 128, "%d", num);
+
+ snprintf (tmp, 128, "%d", num);
print_tuple_str (title, tmp);
}
@@ -157,7 +157,7 @@ do_download__init (cherokee_downloader_t *downloader, void *param)
UNUSED(param);
url = &downloader->request.url;
-
+
print_tuple_str ("Host", url->host.buf);
print_tuple_str ("Request", url->request.buf);
print_tuple_int ("Port", url->port);
@@ -195,7 +195,7 @@ do_download__has_headers (cherokee_downloader_t *downloader, void *param)
*/
if (global_fd == UNSET_FD) {
char *name;
-
+
name = strrchr (req->buf, '/');
if (name == NULL) {
name = "index.html";
@@ -257,7 +257,7 @@ do_download__read_body (cherokee_downloader_t *downloader, void *param)
}
cherokee_buffer_mrproper (&tmp);
- return ret_ok;
+ return ret_ok;
}
@@ -295,7 +295,7 @@ do_download (cherokee_downloader_t *downloader)
if ( !reading && (status & downloader_status_post_sent)) {
reading = true;
}
-
+
if ( (status & downloader_status_headers_received) && !got_headers) {
do_download__has_headers (downloader, NULL);
got_headers = true;
@@ -309,16 +309,16 @@ do_download (cherokee_downloader_t *downloader)
do_download__finish (downloader, NULL);
}
break;
-
+
case ret_eagain:
/* It's going on..
*/
break;
-
+
case ret_eof_have_data:
if ((status & downloader_status_headers_received) && !got_headers) {
do_download__has_headers (downloader, NULL);
- got_headers = true;
+ got_headers = true;
}
if (status & downloader_status_data_available) {
do_download__read_body (downloader, NULL);
@@ -335,7 +335,7 @@ do_download (cherokee_downloader_t *downloader)
/* Finished or critical error
*/
return ret;
-
+
default:
SHOULDNT_HAPPEN;
return ret_error;
@@ -393,9 +393,9 @@ main (int argc, char **argv)
}
break;
- case 0:
+ case 0:
break;
-
+
case 'q':
quiet = true;
break;
@@ -415,7 +415,7 @@ main (int argc, char **argv)
/* The rest..
*/
param_num = argc - optind;
-
+
if (param_num <= 0) {
print_usage();
return EXIT_OK;
@@ -428,7 +428,7 @@ main (int argc, char **argv)
for (val=optind; val<optind+param_num; val++) {
cherokee_buffer_t url = CHEROKEE_BUF_INIT;
-
+
/* Build the url buffer
*/
ret = cherokee_buffer_add_va (&url, "%s", argv[val]);
@@ -475,7 +475,7 @@ main (int argc, char **argv)
/* Close the output file
*/
re = close (output_fd);
- if (re != 0)
+ if (re != 0)
exit (EXIT_ERROR);
cherokee_mrproper();
View
2  cget/proxy.c
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
- */
+ */
#include "common-internal.h"
#include "proxy.h"
View
2  cget/proxy.h
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
- */
+ */
#ifndef CGET_PROXY_H
#define CGET_PROXY_H
View
104 cherokee/Makefile.am
@@ -50,7 +50,7 @@ pcre/pcre_globals.c \
pcre/pcre_compile.c \
pcre/pcre_tables.c \
pcre/pcre_exec.c \
-pcre/pcre_get.c
+pcre/pcre_get.c
getopt_src = \
getopt/getopt.h \
@@ -109,7 +109,7 @@ $(common_ldflags) \
-module \
-avoid-version \
-export-dynamic \
-$(module_ldflags_w32)
+$(module_ldflags_w32)
#
@@ -119,7 +119,7 @@ rule_directory = \
rule_directory.c \
rule_directory.h
-libplugin_directory_la_LDFLAGS = $(module_ldflags)
+libplugin_directory_la_LDFLAGS = $(module_ldflags)
libplugin_directory_la_SOURCES = $(rule_directory)
if STATIC_RULE_DIRECTORY
@@ -136,7 +136,7 @@ rule_extensions = \
rule_extensions.c \
rule_extensions.h
-libplugin_extensions_la_LDFLAGS = $(module_ldflags)
+libplugin_extensions_la_LDFLAGS = $(module_ldflags)
libplugin_extensions_la_SOURCES = $(rule_extensions)
if STATIC_RULE_EXTENSIONS
@@ -153,7 +153,7 @@ rule_request = \
rule_request.c \
rule_request.h
-libplugin_request_la_LDFLAGS = $(module_ldflags)
+libplugin_request_la_LDFLAGS = $(module_ldflags)
libplugin_request_la_SOURCES = $(rule_request)
if STATIC_RULE_REQUEST
@@ -170,7 +170,7 @@ rule_header = \
rule_header.c \
rule_header.h
-libplugin_header_la_LDFLAGS = $(module_ldflags)
+libplugin_header_la_LDFLAGS = $(module_ldflags)
libplugin_header_la_SOURCES = $(rule_header)
if STATIC_RULE_HEADER
@@ -187,7 +187,7 @@ rule_exists = \
rule_exists.c \
rule_exists.h
-libplugin_exists_la_LDFLAGS = $(module_ldflags)
+libplugin_exists_la_LDFLAGS = $(module_ldflags)
libplugin_exists_la_SOURCES = $(rule_exists)
if STATIC_RULE_EXISTS
@@ -204,7 +204,7 @@ rule_url_arg = \
rule_url_arg.c \
rule_url_arg.h
-libplugin_url_arg_la_LDFLAGS = $(module_ldflags)
+libplugin_url_arg_la_LDFLAGS = $(module_ldflags)
libplugin_url_arg_la_SOURCES = $(rule_url_arg)
if STATIC_RULE_URL_ARG
@@ -238,7 +238,7 @@ rule_bind = \
rule_bind.c \
rule_bind.h
-libplugin_bind_la_LDFLAGS = $(module_ldflags)
+libplugin_bind_la_LDFLAGS = $(module_ldflags)
libplugin_bind_la_SOURCES = $(rule_bind)
if STATIC_RULE_BIND
@@ -255,7 +255,7 @@ rule_method = \
rule_method.c \
rule_method.h
-libplugin_method_la_LDFLAGS = $(module_ldflags)
+libplugin_method_la_LDFLAGS = $(module_ldflags)
libplugin_method_la_SOURCES = $(rule_method)
if STATIC_RULE_METHOD
@@ -272,7 +272,7 @@ rule_from = \
rule_from.c \
rule_from.h
-libplugin_from_la_LDFLAGS = $(module_ldflags)
+libplugin_from_la_LDFLAGS = $(module_ldflags)
libplugin_from_la_SOURCES = $(rule_from)
if STATIC_RULE_FROM
@@ -290,7 +290,7 @@ rule_geoip = \
rule_geoip.c \
rule_geoip.h
-libplugin_geoip_la_LDFLAGS = $(module_ldflags)
+libplugin_geoip_la_LDFLAGS = $(module_ldflags)
libplugin_geoip_la_SOURCES = $(rule_geoip)
libplugin_geoip_la_LIBADD = -lGeoIP
@@ -310,7 +310,7 @@ rule_not = \
rule_not.c \
rule_not.h
-libplugin_not_la_LDFLAGS = $(module_ldflags)
+libplugin_not_la_LDFLAGS = $(module_ldflags)
libplugin_not_la_SOURCES = $(rule_not)
if STATIC_RULE_NOT
@@ -327,7 +327,7 @@ rule_and = \
rule_and.c \
rule_and.h
-libplugin_and_la_LDFLAGS = $(module_ldflags)
+libplugin_and_la_LDFLAGS = $(module_ldflags)
libplugin_and_la_SOURCES = $(rule_and)
if STATIC_RULE_AND
@@ -344,7 +344,7 @@ rule_or = \
rule_or.c \
rule_or.h
-libplugin_or_la_LDFLAGS = $(module_ldflags)
+libplugin_or_la_LDFLAGS = $(module_ldflags)
libplugin_or_la_SOURCES = $(rule_or)
if STATIC_RULE_OR
@@ -361,7 +361,7 @@ vrule_wildcard = \
vrule_wildcard.c \
vrule_wildcard.h
-libplugin_wildcard_la_LDFLAGS = $(module_ldflags)
+libplugin_wildcard_la_LDFLAGS = $(module_ldflags)
libplugin_wildcard_la_SOURCES = $(vrule_wildcard)
if STATIC_VRULE_WILDCARD
@@ -434,7 +434,7 @@ gen_evhost = \
gen_evhost.c \
gen_evhost.h
-libplugin_evhost_la_LDFLAGS = $(module_ldflags)
+libplugin_evhost_la_LDFLAGS = $(module_ldflags)
libplugin_evhost_la_SOURCES = $(gen_evhost)
if STATIC_GEN_EVHOST
@@ -450,7 +450,7 @@ endif
handler_server_info = \
handler_server_info.c \
handler_server_info.h \
-logo.inc
+logo.inc
libplugin_server_info_la_LDFLAGS = $(module_ldflags)
libplugin_server_info_la_SOURCES = $(handler_server_info)
@@ -470,7 +470,7 @@ handler_file = \
handler_file.c \
handler_file.h
-libplugin_file_la_LDFLAGS = $(module_ldflags)
+libplugin_file_la_LDFLAGS = $(module_ldflags)
libplugin_file_la_SOURCES = $(handler_file)
if STATIC_HANDLER_FILE
@@ -487,7 +487,7 @@ handler_dirlist = \
handler_dirlist.c \
handler_dirlist.h
-libplugin_dirlist_la_LDFLAGS = $(module_ldflags)
+libplugin_dirlist_la_LDFLAGS = $(module_ldflags)
libplugin_dirlist_la_SOURCES = $(handler_dirlist)
if STATIC_HANDLER_DIRLIST
@@ -508,7 +508,7 @@ handler_render_rrd = \
$(rrd_common) \
handler_render_rrd.c \
handler_render_rrd.h \
-logo.inc
+logo.inc
libplugin_render_rrd_la_LDFLAGS = $(module_ldflags)
libplugin_render_rrd_la_SOURCES = $(handler_render_rrd)
@@ -533,7 +533,7 @@ $(handlercgi_cgi) \
handler_cgi.c \
handler_cgi.h
-libplugin_cgi_la_LDFLAGS = $(module_ldflags)
+libplugin_cgi_la_LDFLAGS = $(module_ldflags)
libplugin_cgi_la_SOURCES = $(handler_cgi)
libplugin_cgi_la_LIBADD = $(dynamic_handler_file_lib)
@@ -556,7 +556,7 @@ $(handlerscgi_cgi) \
handler_scgi.h \
handler_scgi.c
-libplugin_scgi_la_LDFLAGS = $(module_ldflags)
+libplugin_scgi_la_LDFLAGS = $(module_ldflags)
libplugin_scgi_la_SOURCES = $(handler_scgi)
libplugin_scgi_la_LIBADD = $(dynamic_handler_file_lib)
@@ -580,7 +580,7 @@ fastcgi.h \
handler_fcgi.h \
handler_fcgi.c
-libplugin_fcgi_la_LDFLAGS = $(module_ldflags)
+libplugin_fcgi_la_LDFLAGS = $(module_ldflags)
libplugin_fcgi_la_SOURCES = $(handler_fcgi)
libplugin_fcgi_la_LIBADD = $(dynamic_handler_file_lib)
@@ -603,7 +603,7 @@ $(handleruwsgi_cgi) \
handler_uwsgi.h \
handler_uwsgi.c
-libplugin_uwsgi_la_LDFLAGS = $(module_ldflags)
+libplugin_uwsgi_la_LDFLAGS = $(module_ldflags)
libplugin_uwsgi_la_SOURCES = $(handler_uwsgi)
libplugin_uwsgi_la_LIBADD = $(dynamic_handler_file_lib)
@@ -629,9 +629,9 @@ fcgi_dispatcher.c \
fcgi_manager.h \
fcgi_manager.c \
handler_fastcgi.c \
-handler_fastcgi.h
+handler_fastcgi.h
-libplugin_fastcgi_la_LDFLAGS = $(module_ldflags)
+libplugin_fastcgi_la_LDFLAGS = $(module_ldflags)
libplugin_fastcgi_la_SOURCES = $(handler_fastcgi)
libplugin_fastcgi_la_LIBADD = $(dynamic_handler_file_lib)
@@ -729,7 +729,7 @@ handler_proxy.h \
proxy_hosts.h \
proxy_hosts.c
-libplugin_proxy_la_LDFLAGS = $(module_ldflags)
+libplugin_proxy_la_LDFLAGS = $(module_ldflags)
libplugin_proxy_la_SOURCES = $(handler_proxy)
if STATIC_HANDLER_PROXY
@@ -748,7 +748,7 @@ handler_ssi = \
handler_ssi.c \
handler_ssi.h
-libplugin_ssi_la_LDFLAGS = $(module_ldflags)
+libplugin_ssi_la_LDFLAGS = $(module_ldflags)
libplugin_ssi_la_SOURCES = $(handler_ssi)
if STATIC_HANDLER_SSI
@@ -765,7 +765,7 @@ handler_secdownload = \
handler_secdownload.c \
handler_secdownload.h
-libplugin_secdownload_la_LDFLAGS = $(module_ldflags)
+libplugin_secdownload_la_LDFLAGS = $(module_ldflags)
libplugin_secdownload_la_SOURCES = $(handler_secdownload)
if STATIC_HANDLER_SECDOWNLOAD
@@ -782,7 +782,7 @@ handler_empty_gif = \
handler_empty_gif.c \
handler_empty_gif.h
-libplugin_empty_gif_la_LDFLAGS = $(module_ldflags)
+libplugin_empty_gif_la_LDFLAGS = $(module_ldflags)
libplugin_empty_gif_la_SOURCES = $(handler_empty_gif)
if STATIC_HANDLER_EMPTY_GIF
@@ -842,9 +842,9 @@ handler_custom_error = \
handler_custom_error.c \
handler_custom_error.h
-libplugin_custom_error_la_LDFLAGS = $(module_ldflags)
+libplugin_custom_error_la_LDFLAGS = $(module_ldflags)
libplugin_custom_error_la_SOURCES = $(handler_custom_error)
-libplugin_custom_error_la_LIBADD = libcherokee-client.la
+libplugin_custom_error_la_LIBADD = libcherokee-client.la
if STATIC_HANDLER_CUSTOM_ERROR
static_handler_custom_error_src = $(handler_custom_error)
@@ -860,11 +860,11 @@ handler_admin = \
handler_admin.c \
handler_admin.h \
admin_server.h \
-admin_server.c
+admin_server.c
-libplugin_admin_la_LDFLAGS = $(module_ldflags)
+libplugin_admin_la_LDFLAGS = $(module_ldflags)
libplugin_admin_la_SOURCES = $(handler_admin)
-libplugin_admin_la_LIBADD = libcherokee-config.la libcherokee-client.la
+libplugin_admin_la_LIBADD = libcherokee-config.la libcherokee-client.la
if STATIC_HANDLER_ADMIN
static_handler_admin_src = $(handler_admin)
@@ -914,7 +914,7 @@ logger_custom = \
logger_custom.h \
logger_custom.c
-libplugin_custom_la_LDFLAGS = $(module_ldflags)
+libplugin_custom_la_LDFLAGS = $(module_ldflags)
libplugin_custom_la_SOURCES = $(logger_custom)
if STATIC_LOGGER_CUSTOM
@@ -931,7 +931,7 @@ logger_ncsa = \
logger_ncsa.h \
logger_ncsa.c
-libplugin_ncsa_la_LDFLAGS = $(module_ldflags)
+libplugin_ncsa_la_LDFLAGS = $(module_ldflags)
libplugin_ncsa_la_SOURCES = $(logger_ncsa)
if STATIC_LOGGER_NCSA
@@ -970,7 +970,7 @@ validator_pam = \
validator_pam.c \
validator_pam.h
-libplugin_pam_la_LDFLAGS = $(module_ldflags)
+libplugin_pam_la_LDFLAGS = $(module_ldflags)
libplugin_pam_la_SOURCES = $(validator_pam)
libplugin_pam_la_LIBADD = -lpam
@@ -991,7 +991,7 @@ validator_ldap = \
validator_ldap.c \
validator_ldap.h
-libplugin_ldap_la_LDFLAGS = $(module_ldflags)
+libplugin_ldap_la_LDFLAGS = $(module_ldflags)
libplugin_ldap_la_SOURCES = $(validator_ldap)
libplugin_ldap_la_LIBADD = -lldap
@@ -1017,7 +1017,7 @@ $(validator_file_file) \
validator_htpasswd.c \
validator_htpasswd.h
-libplugin_htpasswd_la_LDFLAGS = $(module_ldflags)
+libplugin_htpasswd_la_LDFLAGS = $(module_ldflags)
libplugin_htpasswd_la_SOURCES = $(validator_htpasswd)
libplugin_htpasswd_la_LIBADD = $(CRYPT_LIBS)
libplugin_htpasswd_la_CFLAGS = $(CRYPT_CFLAGS)
@@ -1043,7 +1043,7 @@ $(validator_file_file) \
validator_plain.c \
validator_plain.h
-libplugin_plain_la_LDFLAGS = $(module_ldflags)
+libplugin_plain_la_LDFLAGS = $(module_ldflags)
libplugin_plain_la_SOURCES = $(validator_plain)
if STATIC_VALIDATOR_PLAIN
@@ -1065,7 +1065,7 @@ $(validator_file_file) \
validator_htdigest.c \
validator_htdigest.h
-libplugin_htdigest_la_LDFLAGS = $(module_ldflags)
+libplugin_htdigest_la_LDFLAGS = $(module_ldflags)
libplugin_htdigest_la_SOURCES = $(validator_htdigest)
if STATIC_VALIDATOR_HTDIGEST
@@ -1082,7 +1082,7 @@ validator_authlist = \
validator_authlist.c \
validator_authlist.h
-libplugin_authlist_la_LDFLAGS = $(module_ldflags)
+libplugin_authlist_la_LDFLAGS = $(module_ldflags)
libplugin_authlist_la_SOURCES = $(validator_authlist)
if STATIC_VALIDATOR_AUTHLIST
@@ -1149,7 +1149,7 @@ balancer_round_robin = \
balancer_round_robin.c \
balancer_round_robin.h
-libplugin_round_robin_la_LDFLAGS = $(module_ldflags)
+libplugin_round_robin_la_LDFLAGS = $(module_ldflags)
libplugin_round_robin_la_SOURCES = $(balancer_round_robin)
if STATIC_BALANCER_ROUND_ROBIN
@@ -1167,7 +1167,7 @@ balancer_ip_hash = \
balancer_ip_hash.c \
balancer_ip_hash.h
-libplugin_ip_hash_la_LDFLAGS = $(module_ldflags)
+libplugin_ip_hash_la_LDFLAGS = $(module_ldflags)
libplugin_ip_hash_la_SOURCES = $(balancer_ip_hash)
if STATIC_BALANCER_IP_HASH
@@ -1262,7 +1262,7 @@ unix4win32.c \
win32_misc.h \
win32_misc.c \
win32_cservice.h \
-win32_cservice.c
+win32_cservice.c
endif
if USE_POSIX_SHM
@@ -1387,7 +1387,7 @@ downloader_async.h \
downloader_async.c
-if STATIC_HANDLER_FCGI
+if STATIC_HANDLER_FCGI
common_cgi = handler_cgi_base.h \
handler_cgi_base.c
endif
@@ -1562,7 +1562,7 @@ collector.c
libcherokee_config_la_SOURCES = \
admin_client.h \
-admin_client.c
+admin_client.c
#
# Header files
@@ -1675,7 +1675,7 @@ $(dynamic_validator_authlist_lib) \
$(dynamic_validator_mysql_lib) \
$(dynamic_cryptor_libssl_lib) \
$(dynamic_balancer_round_robin_lib) \
-$(dynamic_balancer_ip_hash_lib)
+$(dynamic_balancer_ip_hash_lib)
#
@@ -1733,7 +1733,7 @@ win32_cherokeeserv =
endif
win32_cherokeeserv_SOURCES = win32_cherokeeserv.c
-win32_cherokeeserv_LDADD = libcherokee-config.la libcherokee-base.la libcherokee-client.la
+win32_cherokeeserv_LDADD = libcherokee-config.la libcherokee-base.la libcherokee-client.la
#
# Test programs
@@ -1741,7 +1741,7 @@ win32_cherokeeserv_LDADD = libcherokee-config.la libcherokee-base.la libcherokee
noinst_PROGRAMS = $(win32_cherokeeserv)
# test_SOURCES = test.c
-# test_LDADD = libcherokee-config.la libcherokee-base.la libcherokee-client.la
+# test_LDADD = libcherokee-config.la libcherokee-base.la libcherokee-client.la
CLEANFILES = \
View
2  cherokee/pcre/pcre.h
@@ -43,7 +43,7 @@ POSSIBILITY OF SUCH DAMAGE.
#define PCRE_MAJOR 7
#define PCRE_MINOR 3
-#define PCRE_PRERELEASE
+#define PCRE_PRERELEASE
#define PCRE_DATE 2007-08-28
/* When an application links to a PCRE DLL in Windows, the symbols that are
View
10 cherokee/zlib/deflate.c
@@ -1,7 +1,7 @@
/* +++ deflate.c */
/* deflate.c -- compress data using the deflation algorithm
* Copyright (C) 1995-1996 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
+ * For conditions of distribution and use, see copyright notice in zlib.h
*/
/*
@@ -303,7 +303,7 @@ int zlib_deflateReset(
)
{
deflate_state *s;
-
+
if (strm == NULL || strm->state == NULL)
return Z_STREAM_ERROR;
@@ -377,7 +377,7 @@ static void putShortMSB(
{
put_byte(s, (Byte)(b >> 8));
put_byte(s, (Byte)(b & 0xff));
-}
+}
/* =========================================================================
* Flush as much pending output as possible. All deflate() output goes
@@ -1113,7 +1113,7 @@ static block_state deflate_fast(
* always MIN_MATCH bytes ahead.
*/
} while (--s->match_length != 0);
- s->strstart++;
+ s->strstart++;
} else {
s->strstart += s->match_length;
s->match_length = 0;
@@ -1131,7 +1131,7 @@ static block_state deflate_fast(
Tracevv((stderr,"%c", s->window[s->strstart]));
bflush = zlib_tr_tally (s, 0, s->window[s->strstart]);
s->lookahead--;
- s->strstart++;
+ s->strstart++;
}
if (bflush) FLUSH_BLOCK(s, 0);
}
View
4 cherokee/zlib/deftree.c
@@ -1,7 +1,7 @@
/* +++ trees.c */
/* trees.c -- output deflated data using Huffman coding
* Copyright (C) 1995-1996 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h
+ * For conditions of distribution and use, see copyright notice in zlib.h
*/
/*
@@ -1098,7 +1098,7 @@ static void copy_block(
s->last_eob_len = 8; /* enough lookahead for inflate */
if (header) {
- put_short(s, (ush)len);
+ put_short(s, (ush)len);
put_short(s, (ush)~len);
#ifdef DEBUG_ZLIB
s->bits_sent += 2*16;
View
10 cherokee/zlib/defutil.h
@@ -1,11 +1,11 @@
-#define Assert(err, str)
-#define Trace(dummy)
-#define Tracev(dummy)
-#define Tracecv(err, dummy)
-#define Tracevv(dummy)
+#define Assert(err, str)
+#define Trace(dummy)
+#define Tracev(dummy)
+#define Tracecv(err, dummy)
+#define Tracevv(dummy)
View
2  cherokee/zlib/zconf.h
@@ -1,6 +1,6 @@
/* zconf.h -- configuration of the zlib compression library
* Copyright (C) 1995-1998 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
+ * For conditions of distribution and use, see copyright notice in zlib.h
*/
/* @(#) $Id$ */
View
18 cherokee/zlib/zlib.h
@@ -37,7 +37,7 @@
#define ZLIB_VERSION "1.1.3"
-/*
+/*
The 'zlib' compression library provides in-memory compression and
decompression functions, including integrity checks of the uncompressed
data. This version of the library supports only one compression method
@@ -171,7 +171,7 @@ extern int zlib_deflate_workspacesize (void);
returned in stream->workspace before calling zlib_deflateInit().
*/
-/*
+/*
extern int deflateInit (z_streamp strm, int level);
Initializes the internal stream state for compression. The fields
@@ -249,7 +249,7 @@ extern int zlib_deflate (z_streamp strm, int flush);
more input data, until it returns with Z_STREAM_END or an error. After
deflate has returned Z_STREAM_END, the only possible operations on the
stream are deflateReset or deflateEnd.
-
+
Z_FINISH can be used immediately after deflateInit if all the compression
is to be done in a single step. In this case, avail_out must be at least
0.1% larger than avail_in plus 12 bytes. If deflate does not return
@@ -293,7 +293,7 @@ extern int zlib_inflate_workspacesize (void);
returned in stream->workspace before calling zlib_inflateInit().
*/
-/*
+/*
extern int zlib_inflateInit (z_streamp strm);
Initializes the internal stream state for decompression. The fields
@@ -362,7 +362,7 @@ extern int zlib_inflate (z_streamp strm, int flush);
If a preset dictionary is needed at this point (see inflateSetDictionary
below), inflate sets strm-adler to the adler32 checksum of the
- dictionary chosen by the compressor and returns Z_NEED_DICT; otherwise
+ dictionary chosen by the compressor and returns Z_NEED_DICT; otherwise
it sets strm->adler to the adler32 checksum of all output produced
so far (that is, total_out bytes) and returns Z_OK, Z_STREAM_END or
an error code as described below. At the end of the stream, inflate()
@@ -400,7 +400,7 @@ extern int zlib_inflateEnd (z_streamp strm);
The following functions are needed only in some special applications.
*/
-/*
+/*
extern int deflateInit2 (z_streamp strm,
int level,
int method,
@@ -443,7 +443,7 @@ extern int deflateInit2 (z_streamp strm,
method). msg is set to null if there is no error message. deflateInit2 does
not perform any compression: this will be done by deflate().
*/
-
+
extern int zlib_deflateSetDictionary (z_streamp strm,
const Byte *dictionary,
uInt dictLength);
@@ -527,7 +527,7 @@ extern int zlib_deflateParams (z_streamp strm, int level, int strategy);
if strm->avail_out was zero.
*/
-/*
+/*
extern int inflateInit2 (z_streamp strm, int windowBits);
This is another version of inflateInit with an extra parameter. The
@@ -569,7 +569,7 @@ extern int zlib_inflateSetDictionary (z_streamp strm,
*/
extern int zlib_inflateSync (z_streamp strm);
-/*
+/*
Skips invalid compressed data until a full flush point (see above the
description of deflate with Z_FULL_FLUSH) can be found, or until all
available input is skipped. No output is provided.
View
64 contrib/05to06.py
@@ -66,7 +66,7 @@ class Syntax:
'directoryindex': 'directory_index',
'scriptalias': 'script_alias'
}
-
+
def __init__ (self, lex):
self._lex = lex
@@ -82,7 +82,7 @@ def _process_entry_guts (self, prefix):
print '%s!handler = %s' % (prefix, val)
kind, val = self._lex.get_token()
- if kind != '{':
+ if kind != '{':
self._lex.rewind()
return True
@@ -93,7 +93,7 @@ def _process_entry_guts (self, prefix):
# Special cases
if kind == '}':
break
-
+
elif kind == 'server':
kind, val_prop_val = self._lex.get_token()
print '%s!handler!balancer = round_robin' % (prefix)
@@ -125,7 +125,7 @@ def _process_entry_guts (self, prefix):
val_prop_low = val_prop.lower()
if val_prop_low == 'justabout':
print '%s!handler!just_about = 1' % (prefix)
- continue
+ continue
elif val_prop_low == 'env':
kind, val_env_name = self._lex.get_token()
@@ -135,7 +135,7 @@ def _process_entry_guts (self, prefix):
if kind != 'str': raise "Expected a str"
print '%s!handler!env!%s = %s' % (prefix, val_env_name, val_env_val)
- continue
+ continue
elif val_prop_low == 'show' or \
val_prop_low == 'rewrite':
@@ -150,7 +150,7 @@ def _process_entry_guts (self, prefix):
print '%s!handler!date = %d' % (prefix, 'date' in val_prop)
print '%s!handler!user = %d' % (prefix, 'owner' in val_prop)
continue
-
+
# redir
rewrite = (kind == 'str' and val_prop.lower() == 'rewrite')
if not rewrite: self._lex.rewind()
@@ -175,13 +175,13 @@ def _process_entry_guts (self, prefix):
else:
raise "Expected a str or '}'"
-
+
# Default case
val_prop_low = val_prop.lower()
if val_prop_low in self.similar_entries:
val_prop = self.similar_entries[val_prop_low]
else:
- val_prop = val_prop_low
+ val_prop = val_prop_low
# Get property value
kind, val_prop_val = self._lex.get_token()
@@ -191,7 +191,7 @@ def _process_entry_guts (self, prefix):
kind, val = self._lex.get_token()
if kind != 'path': raise "Malformed DocumentRoot"
print '%s!document_root = %s' % (prefix, val)
-
+
elif kind == 'auth':
return self._process_auth (prefix)
@@ -203,7 +203,7 @@ def _process_entry_guts (self, prefix):
if not kind in ['str', 'list']: raise "Malformed Allow from"
print '%s!allow_from = %s' % (prefix, val_ip)
-
+
else:
self._lex.rewind()
return False
@@ -226,7 +226,7 @@ def _process_auth (self, prefix):
if kind == 'user':
kind = 'str'
val_prop_name = 'user'
-
+
if kind == '}':
self._lex.rewind()
break
@@ -259,7 +259,7 @@ def _process_auth (self, prefix):
kind, val_val = self._lex.get_token()
print "%s!auth!%s = %s" % (prefix, val_prop, val_val)
else:
- self._lex.rewind()
+ self._lex.rewind()
kind, val = self._lex.get_token()
if kind != '}' : raise "Malformed Auth"
@@ -281,7 +281,7 @@ def _process_entry (self, prefix):
def _process_encoder (self, prefix):
while True:
kind, val = self._lex.get_token()
- if kind not in ['allow', 'deny']:
+ if kind not in ['allow', 'deny']:
raise "Malformed encoder"
kind_val, val_val = self._lex.get_token()
@@ -313,7 +313,7 @@ def _process_log (self, prefix):
kind, val2 = self._lex.get_token()
if kind != 'path': raise "Malformed Log"
-
+
if val2[0] == '/' or val2[1:2] == ':\\':
print "%s!%s!type = file" % (prefix, entry)
print "%s!%s!filename = %s" % (prefix, entry, val2)
@@ -372,7 +372,7 @@ def _process_icons_content (self):
print "icons!suffix!%s = %s" % (val_file, val_suffixes)
else:
- self._lex.rewind()
+ self._lex.rewind()
return False
return True
@@ -466,7 +466,7 @@ def _process_virtual_server_content (self, vserver='default'):
elif kind == 'errorhandler':
kind, handler_val = self._lex.get_token()
if kind != 'str': raise "Malformed ErrorHandler"
-
+
kind, val = self._lex.get_token()
if kind != '{': raise "Malformed ErrorHandler"
@@ -486,14 +486,14 @@ def _process_virtual_server_content (self, vserver='default'):
raise "Malformed ErrorHandler"
print "%s!%s = %s" % (prefix, error_val, url_val)
-
+
kind, val = self._lex.get_token()
if kind != '}': raise "Malformed ErrorHandler"
elif kind == 'log':
kind, log_val = self._lex.get_token()
if kind != 'str': raise "Malformed Log"
-
+
kind, val = self._lex.get_token()
if kind != '{':
self._lex.rewind()
@@ -507,7 +507,7 @@ def _process_virtual_server_content (self, vserver='default'):
if kind != '}': raise "Malformed Log"
else:
- self._lex.rewind()
+ self._lex.rewind()
return False
return True
@@ -541,7 +541,7 @@ def _process_server_content (self):
elif kind == 'encoder':
kind, enc_val = self._lex.get_token()
if kind != 'str': raise "Malformed encoder"
-
+
kind, val = self._lex.get_token()
if kind != '{': raise "Malformed encoder"
@@ -569,7 +569,7 @@ def _process_server_content (self):
kind, val_type = self._lex.get_token()
if kind != 'policy':
raise "Malformed threadnumber"
-
+
kind, val_val = self._lex.get_token()
if kind != 'str': raise "Malformed threadnumber"
@@ -590,7 +590,7 @@ def _process_server_content (self):
raise "Malformed Sendfile"
val = val.lower()
-
+
if val == 'minsize':
kind, val_num = self._lex.get_token()
if kind != 'int': raise "Malformed Sendfile"
@@ -602,12 +602,12 @@ def _process_server_content (self):
if kind != 'int': raise "Malformed Sendfile"
print "server!sendfile_max = %s" % (val_num)
-
+
else:
raise "Malformed Sendfile"
else:
- self._lex.rewind()
+ self._lex.rewind()
return False
return True
@@ -655,7 +655,7 @@ def process_sentence (self):
kind, val = self._lex.get_token()
if kind == None: return False
self._lex.rewind()
-
+
# Global server stuff
ok = self._process_server_content ()
if ok: return True
@@ -692,10 +692,10 @@ class Lexer:
special_strings = ['server_info']
reserved_words = ['{', '}', 'porttls', 'port', 'directoryindex', 'directory', 'extension',
- 'request', 'handler', 'ipv6', 'timeout', 'keepalive', 'logflushinterval',
+ 'request', 'handler', 'ipv6', 'timeout', 'keepalive', 'logflushinterval',
'maxkeepaliverequests', 'servertokens', 'encoder', 'log', 'server',
'allow', 'deny', 'pidfile', 'icons', 'mimefile', 'errorhandler', 'auth',
- 'include', 'listenqueuesize', 'listen', 'userdir', 'user','group', 'chroot',
+ 'include', 'listenqueuesize', 'listen', 'userdir', 'user','group', 'chroot',
'maxfds', 'maxconnectionreuse', 'panicaction', 'pollmethod', 'documentroot',
'threadnumber', 'policy', 'sendfile', 'file', 'suffix', 'parentdirectory',
'default', 'sslcertificatefile', 'sslcertificatekeyfile', 'sslcalistfile']
@@ -704,7 +704,7 @@ def __init__ (self, txt):
self._txt = txt
self._last = None,None
self._rewinded = False
-
+
def _find_consume (self, s):
found = (self._txt.lower().find (s.lower()) == 0)
if not found: return False
@@ -739,7 +739,7 @@ def _get_word (self):
while self._txt[0] in " \t":
self._txt = self._txt[1:]
return word
-
+
def rewind (self):
self._rewinded = True
@@ -747,7 +747,7 @@ def get_token (self):
if self._rewinded:
self._rewinded = False
return self._last
-
+
self._last = self._get_token_guts()
return self._last
@@ -817,7 +817,7 @@ def convert (self):
tmp = filter (lambda x: len(x) > 0 and x[0] != '#',
map (lambda x: x.strip(),
self._in.readlines()))
- if not len(tmp): return
+ if not len(tmp): return
incoming = reduce (lambda x,y: x+' '+y, tmp)
self.lex = Lexer (incoming)
@@ -828,6 +828,6 @@ def convert (self):
def main ():
c = Converter (sys.stdin, sys.stdout)
c.convert()
-
+
if __name__ == "__main__":
main()
View
10 contrib/06to07.py
@@ -14,7 +14,7 @@
def reparent_child (orig, target):
if not orig:
- return
+ return
for p in orig._child:
if p == 'priority':
@@ -47,7 +47,7 @@ def convert (fin, fout):
else:
cin['vserver!%s!rule!%s!match!type' %(vserver, prio)] = 'directory'
cin['vserver!%s!rule!%s!match!directory'%(vserver, prio)] = _dir
- reparent_child (cin['vserver!%s!directory!%s'%(vserver, _dir)],
+ reparent_child (cin['vserver!%s!directory!%s'%(vserver, _dir)],
cin['vserver!%s!rule!%s' %(vserver, prio)])
exts = cin['vserver!%s!extensions'%(vserver)]
@@ -56,7 +56,7 @@ def convert (fin, fout):
prio = cin.get_val('vserver!%s!extensions!%s!priority'%(vserver, ext))
cin['vserver!%s!rule!%s!match!type' %(vserver, prio)] = 'extensions'
cin['vserver!%s!rule!%s!match!extensions'%(vserver, prio)] = ext
- reparent_child (cin['vserver!%s!extensions!%s'%(vserver, ext)],
+ reparent_child (cin['vserver!%s!extensions!%s'%(vserver, ext)],
cin['vserver!%s!rule!%s' %(vserver, prio)])
reqs = cin['vserver!%s!request'%(vserver)]
@@ -65,7 +65,7 @@ def convert (fin, fout):
prio = cin.get_val('vserver!%s!request!%s!priority'%(vserver, req))
cin['vserver!%s!rule!%s!match!type' %(vserver, prio)] = 'request'
cin['vserver!%s!rule!%s!match!request'%(vserver, prio)] = req
- reparent_child (cin['vserver!%s!request!%s'%(vserver, req)],
+ reparent_child (cin['vserver!%s!request!%s'%(vserver, req)],
cin['vserver!%s!rule!%s' %(vserver, prio)])
del (cin["vserver!%s!directory" %(vserver)])
@@ -77,6 +77,6 @@ def convert (fin, fout):
def main ():
convert (sys.argv[1], sys.argv[2])
-
+
if __name__ == "__main__":
main()
View
6 contrib/07to08.py
@@ -45,7 +45,7 @@ def convert (fin, fout):
prio = 1
else:
n += 1
- prio = n
+ prio = n
# Rename the virtual server entry
to = "vserver!%03d" % (prio)
@@ -58,7 +58,7 @@ def convert (fin, fout):
cin['%s!domain!1'%(to)] = vserver
save_result (str(cin), fout)
-
+
def main ():
if len(sys.argv) < 3:
@@ -68,6 +68,6 @@ def main ():
raise SystemExit
convert (sys.argv[1], sys.argv[2])
-
+
if __name__ == "__main__":
main()
View
8 contrib/08to09.py
@@ -52,7 +52,7 @@ def convert (fin, fout):
for v in cin.keys('vserver'):
for r in cin.keys('vserver!%s!rule'%(v)):
balancer = cin.get_val ('vserver!%s!rule!%s!handler!balancer'%(v,r))
- if not balancer:
+ if not balancer:
continue
tipe = cin.get_val('vserver!%s!rule!%s!handler!balancer!type'%(v,r))
@@ -69,7 +69,7 @@ def convert (fin, fout):
if tmp:
for e in tmp:
env[e] = cin.get_val('vserver!%s!rule!%s!handler!balancer!%s!env!%s'%(v,r,h,e))
-
+
sourcen, is_new = add_source ((tipe, host, inte, env))
if is_new:
cin['source!%d!type'%(sourcen)] = tipe
@@ -89,7 +89,7 @@ def convert (fin, fout):
del (cin['server!encoder'])
save_result (str(cin), fout)
-
+
def main ():
if len(sys.argv) < 3:
@@ -99,6 +99,6 @@ def main ():
raise SystemExit
convert (sys.argv[1], sys.argv[2])
-
+
if __name__ == "__main__":
main()
View
2  contrib/0999to09910.py
@@ -47,6 +47,6 @@ def main ():
raise SystemExit
convert (sys.argv[1], sys.argv[2])
-
+
if __name__ == "__main__":
main()
View
2  contrib/bin2buffer.py
@@ -25,7 +25,7 @@ def print_block(info, len):
if (len(lin) > 75):
s += '"%s"\n' % (lin)
lin = ""
-
+
if (siz > 127):
print_block (s, siz)
s = ""
View
4 contrib/tracelor.py
@@ -28,7 +28,7 @@ def build_colors():
continue
color = '\033[0;%d;%dm' % (a,b)
_colors.append(color)
-
+
def thread_color (thread):
global _threads
global _color_n
@@ -48,7 +48,7 @@ def main():
# Thread
thread = None
- if line[0] == '{':
+ if line[0] == '{':
end = line.find('}')
if end > 0:
thread = line[1:end]
View
2  doc/Makefile.am
@@ -3,7 +3,7 @@ ASCIIDOC=python $(top_srcdir)/doc/build/asciidoc.py --conf-file=$(top_srcdir)/do
SUFFIXES = .txt .html
.txt.html:
- $(ASCIIDOC) -o $@ $(top_srcdir)/doc/$<
+ $(ASCIIDOC) -o $@ $(top_srcdir)/doc/$<
doc_DATA = \
index.html \
View
2  doc/basics_download.txt
@@ -7,7 +7,7 @@ Cherokee can be downloaded from the Cherokee Web Server download site
or any of its mirrors. Some users of Cherokee on unix-like systems
will be better off downloading and compiling a source version. The
build process is easy, and it allows you to customize your server to
-suit your needs.
+suit your needs.
Anyway, we provide binary packages for some operating systems and
GNU/Linux distributions:
View
4 doc/cookbook_django.txt
@@ -168,7 +168,7 @@ method of `django.core.servers.fastcgi` in your script.
----
from django.core.servers.fastcgi import runfastcgi
-runfastcgi(method="threaded", daemonize="true", maxrequests=5,
+runfastcgi(method="threaded", daemonize="true", maxrequests=5,
protocol="scgi", socket="/tmp/cherokee-django.socket",
pidfile="/tmp/cherokee-django.pid")
----
@@ -177,7 +177,7 @@ runfastcgi(method="threaded", daemonize="true", maxrequests=5,
----
from django.core.servers.fastcgi import runfastcgi
-runfastcgi(method="threaded", daemonize="true", maxrequests=5,
+runfastcgi(method="threaded", daemonize="true", maxrequests=5,
protocol="scgi", host="127.0.0.1", port=3033)
----
*********************************************************************
View
2  doc/cookbook_mailman.txt
@@ -80,7 +80,7 @@ make sure to have the following checkboxes enabled: `Error handler`,
+
[options="header"]
|=========================
-|Document Root
+|Document Root
|/usr/lib/cgi-bin/mailman/
|=========================
View
8 doc/cookbook_nagios.txt
@@ -44,8 +44,8 @@ follow these steps:
+
[options="header"]
|==============================
-|Nick |Type |Host
-|Nagios |External |10.0.0.11:80
+|Nick |Type |Host
+|Nagios |External |10.0.0.11:80
|==============================
- Then, create the set of rules that match the following list of
@@ -57,7 +57,7 @@ follow these steps:
This, in turn, can be done easily. For compactness sake, we will just
use one but you could define a separate one if you need more precise
-matching. The mechanism is exactly the same:
+matching. The mechanism is exactly the same:
- Within the `Behavior` tab of your virtual server, choose "Regular
Expression" as type of the new rule, and use the expression
@@ -75,7 +75,7 @@ Advanced set up: Cherokee as host
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This is and advanced method only namely. In reality, it is exactly as
-simple.
+simple.
In this case, the relevant information from the configuration
file is limited to a couple of snippets:
View
2  doc/cookbook_streaming.txt
@@ -4,7 +4,7 @@ Cookbook: Streaming Audio and Video
-----------------------------------
It's really easy to configure Cherokee so it streams audio and video
-files instead of sending then as a regular file.
+files instead of sending then as a regular file.
The first thing you have to ensure is that Cherokee has been compiled
with the required libraries. In this case, the FFMpeg library set is
View
2  doc/modules_handlers_common.txt
@@ -19,7 +19,7 @@ Parameters
|Parameters |Type |Description
|`allow_pathinfo` |boolean |Makes the handler to stop parsing the
pathinfo string. Default: `Disabled`.
-|`allow_dirlist` |boolean |Enables showing the contents of a
+|`allow_dirlist` |boolean |Enables showing the contents of a
directory.
|==================================================================
View
2  doc/modules_handlers_dbslayer.txt
@@ -43,7 +43,7 @@ Parameters
|__user__ |The MySQL user to authenticate as.
|__password__ |The MySQL user password to use.
|__db__ |Optional. A MySQL database name.
-|__lang__ |Language from which the information will
+|__lang__ |Language from which the information will
be consumed: json \| python \| ruby \| php
|========================================================
View
2  doc/modules_handlers_dirlist.txt
@@ -37,7 +37,7 @@ Parameters: Theming
|`theme` |string |Optional. The theme to use when displaying
the directory listings.
Default: `default`.
-|`icon_dir` |string |Optional: Alternative path to a new icon
+|`icon_dir` |string |Optional: Alternative path to a new icon
set.
|`notice_files` |string |Optional: List of notice files to be
inserted.
View
2  doc/modules_handlers_secdownload.txt
@@ -14,7 +14,7 @@ Parameters
|Parameters |Type |Description
|`secret` |String |Required. Share secret between the handler and
the script.
-|`timeout` |number |Optional. How long - in seconds - the URL will
+|`timeout` |number |Optional. How long - in seconds - the URL will
be valid.
|==================================================================
View
8 doc/modules_validators_ldap.txt
@@ -14,18 +14,18 @@ Parameters
|====================================================================
|Parameter |Description
|__server__ |Name of the host providing the LDAP service.
-|__port__ |Optional. Port number of the LDAP service.
+|__port__ |Optional. Port number of the LDAP service.
Default: __389__.
-|__binddn__ |Optional. Bind Distinguished Name (`user`). If none
+|__binddn__ |Optional. Bind Distinguished Name (`user`). If none
is provided an anonymous bind will be attempted.
|__bindpw__ |Bind Password (`password`).
|__basedn__ |Base Distinguished Name.
-|__filter__ |A filter that defines the conditions that must be
+|__filter__ |A filter that defines the conditions that must be
fulfilled in order for the search to match a given
entry.
|__tls__ |Optional. Enable the use of TLS based integrity.
Defaults to __0__.
-|__ca_file__ |Optional. It's the CA filename. Must be provided
+|__ca_file__ |Optional. It's the CA filename. Must be provided
if TLS is enabled.
|===================================================================
View
2  doc/modules_validators_mysql.txt
@@ -17,7 +17,7 @@ The MySQL validator allows you to authenticate a user against a MySQL database.
|__unix_socket__ |Optional. A Unix socket.
|__user__ |The MySQL user to authenticate as.
|__passwd__ |The MySQL user password to use.
-|__database__ |Required. The MySQL database to select upon
+|__database__ |Required. The MySQL database to select upon
connection.
|__query__ |Required. The query to execute to authenticate
the HTTP user.
View
6 icons/README.txt
@@ -14,15 +14,15 @@ _________________________________________
purpose, and make any changes you like. All I ask is that you
include a link back to this page in your credits (although a giant
link on every page of your website really isn't needed, contact me
- to discuss specifics).
+ to discuss specifics).
The icons can also be used under Creative Commons Attribution 3.0
- License (Hi Debian folks!) with the following requirements:
+ License (Hi Debian folks!) with the following requirements:
As an author, I would appreciate a reference to my authorship of
the Silk icon set contents within a readme file or equivalent
documentation for the software which includes the set or a subset
- of the icons contained within.
+ of the icons contained within.
[http://creativecommons.org/licenses/by/2.5/]
[http://creativecommons.org/licenses/by/3.0/]
View
10 packages/osx/build.py
@@ -48,11 +48,11 @@ def _perform():
# Build package and image
chdir ('%s/usr/local' %(DESTDIR_ROOT))
- exe ("%s -build -v " % (PKG_MAKER) +
- "-p %s/cherokee-%s.pkg " % (TMP, version) +
- "-f %s/usr/local " % (DESTDIR_ROOT) +
- "-r %s " % (DESTDIR_RESOURCES) +
- "-i %s/Info.plist " % (DESTDIR_RESOURCES) +
+ exe ("%s -build -v " % (PKG_MAKER) +
+ "-p %s/cherokee-%s.pkg " % (TMP, version) +
+ "-f %s/usr/local " % (DESTDIR_ROOT) +
+ "-r %s " % (DESTDIR_RESOURCES) +
+ "-i %s/Info.plist " % (DESTDIR_RESOURCES) +
"-d %s/Description.plist " % (DESTDIR_RESOURCES))
chdir (TMP)
View
2  packages/osx/utils.py
@@ -15,7 +15,7 @@ def red (s):
def yellow (s):
return ESC + '1;33m' + s + RESET
-
+
def blue (s):
return ESC + '0;34m' + s + RESET
View
2  po/admin/generate_POTFILESin.py
@@ -47,6 +47,6 @@ def main():
# Print result
pot_files.sort()
print '\n'.join (pot_files),
-
+
if __name__ == "__main__":
main()
View
6 svnlog2changelog.py
@@ -42,7 +42,7 @@ def render_paths (entry):
for path in entry.getElementsByTagName('path'):
action = path.getAttribute('action')
txt += "\t%s %s\n"%(action, get_text(path.childNodes))
- return txt
+ return txt
def do_parse():
try:
@@ -55,7 +55,7 @@ def do_parse():
log = dom.getElementsByTagName('log')[0]
- for entry in log.getElementsByTagName('logentry'):
+ for entry in log.getElementsByTagName('logentry'):
revision = entry.getAttribute('revision')
date = entry_get_val (entry, 'date').split('T')[0]
time = entry_get_val (entry, 'date').split('T')[1].split('.')[0]
@@ -63,7 +63,7 @@ def do_parse():
msg = reformat_msg(entry_get_val (entry, 'msg'))
author = DEVELOPERS[dev]
paths = render_paths(entry)
-
+
print "%s %s" % (date, author)
print " "*12 + "SVN: r%s, %s - %s" % (revision, dev, time)
print
View
4 www/Makefile.am
@@ -20,7 +20,7 @@ install-data-local: $(HTMLS)
$(INSTALL_DATA) $(top_srcdir)/www/index.html $(DESTDIR)$(cherokeewwwdir)/index.html; \
fi
-uninstall-local:
+uninstall-local:
@if test -f $(DESTDIR)$(cherokeewwwdir)/index.html ; then \
echo "rm -f $(DESTDIR)$(cherokeewwwdir)/index.html"; \
$(RM) -f $(DESTDIR)$(cherokeewwwdir)/index.html; \
@@ -29,4 +29,4 @@ uninstall-local:
EXTRA_DIST = \
$(HTMLS) \
-$(cherokeewwwimages_DATA)
+$(cherokeewwwimages_DATA)
Please sign in to comment.
Something went wrong with that request. Please try again.