Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Thomas Gambier
slapos
Commits
5135b493
Commit
5135b493
authored
Feb 22, 2012
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
version up : Apache httpd 2.4.1.
parent
f1282340
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
142 additions
and
8 deletions
+142
-8
component/apache/buildout.cfg
component/apache/buildout.cfg
+51
-3
component/apache/mod_antiloris-apache-2.4.patch
component/apache/mod_antiloris-apache-2.4.patch
+76
-0
slapos/recipe/apache_zope_backend/template/apache.zope.conf.in
...s/recipe/apache_zope_backend/template/apache.zope.conf.in
+3
-1
slapos/recipe/davstorage/template/httpd.conf.in
slapos/recipe/davstorage/template/httpd.conf.in
+3
-1
slapos/recipe/erp5/template/apache.zope.conf.in
slapos/recipe/erp5/template/apache.zope.conf.in
+3
-1
slapos/recipe/lamp/template/apache.in
slapos/recipe/lamp/template/apache.in
+3
-1
slapos/recipe/pulse2/template/apache.in.in
slapos/recipe/pulse2/template/apache.in.in
+3
-1
No files found.
component/apache/buildout.cfg
View file @
5135b493
...
@@ -13,13 +13,46 @@ extends =
...
@@ -13,13 +13,46 @@ extends =
../sqlite3/buildout.cfg
../sqlite3/buildout.cfg
../zlib/buildout.cfg
../zlib/buildout.cfg
[apr]
recipe = hexagonit.recipe.cmmi
url = http://mir2.ovh.net/ftp.apache.org/dist/apr/apr-1.4.6.tar.bz2
md5sum = ffee70a111fd07372982b0550bbb14b7
configure-options = --disable-static
environment =
CPPFLAGS=-I${libuuid:location}/include
LDFLAGS=-L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib
[apr-util]
recipe = hexagonit.recipe.cmmi
url = http://mir2.ovh.net/ftp.apache.org/dist/apr/apr-util-1.4.1.tar.bz2
md5sum = 52b31b33fb1aa16e65ddaefc76e41151
configure-options =
--disable-static
--with-apr=${apr:location}
--with-openssl=${openssl:location}
--with-expat=${libexpat:location}
--with-sqlite3=${sqlite3:location}
--with-gdbm=${gdbm:location}
--without-lber
--without-ldap
--without-ndbm
--without-berkeley-db
--without-pgsql
--without-mysql
--without-sqlite2
--without-oracle
--without-freetds
--without-odbc
--without-iconv
[apache]
[apache]
# inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
# inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
recipe = hexagonit.recipe.cmmi
recipe = hexagonit.recipe.cmmi
depends =
depends =
${gdbm:version}
${gdbm:version}
url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.22.tar.bz2
version = 2.4.1
md5sum = 9fe3093194c8a57f085ff7c3fc43715f
url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
md5sum = 7d3001c7a26b985d17caa367a868f11c
configure-options = --disable-static
configure-options = --disable-static
--enable-authn-alias
--enable-authn-alias
--enable-bucketeer
--enable-bucketeer
...
@@ -47,7 +80,9 @@ configure-options = --disable-static
...
@@ -47,7 +80,9 @@ configure-options = --disable-static
--enable-dav-fs
--enable-dav-fs
--enable-so
--enable-so
--enable-ssl
--enable-ssl
--with-included-apr
--disable-lua
--with-apr=${apr:location}
--with-apr-util=${apr-util:location}
--with-ssl=${openssl:location}
--with-ssl=${openssl:location}
--with-z=${zlib:location}
--with-z=${zlib:location}
--with-expat=${libexpat:location}
--with-expat=${libexpat:location}
...
@@ -72,11 +107,24 @@ environment =
...
@@ -72,11 +107,24 @@ environment =
CPPFLAGS =-I${libuuid:location}/include
CPPFLAGS =-I${libuuid:location}/include
LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib
LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib
[mod_antiloris-apache-2.4.patch]
# http://www.apachelounge.com/viewtopic.php?p=20551
recipe = hexagonit.recipe.download
url =${:_profile_base_location_}/${:filename}
filename = mod_antiloris-apache-2.4.patch
download-only = true
md5sum = f749e86cdfd8fdc84ef97c3056ffa899
[apache-antiloris]
[apache-antiloris]
# Note: Shall react on each build of apache and reinstall itself
# Note: Shall react on each build of apache and reinstall itself
recipe = hexagonit.recipe.cmmi
recipe = hexagonit.recipe.cmmi
url = http://sourceforge.net/projects/mod-antiloris/files/mod_antiloris-0.4.tar.bz2/download
url = http://sourceforge.net/projects/mod-antiloris/files/mod_antiloris-0.4.tar.bz2/download
md5sum = 66862bf10e9be3a023e475604a28a0b4
md5sum = 66862bf10e9be3a023e475604a28a0b4
patch-options = -p0
patches =
${mod_antiloris-apache-2.4.patch:location}/${mod_antiloris-apache-2.4.patch:filename}
depends =
${apache:version}
configure-command = ${apache:location}/bin/apxs
configure-command = ${apache:location}/bin/apxs
configure-options = -c mod_antiloris.c
configure-options = -c mod_antiloris.c
make-binary = ${:configure-command}
make-binary = ${:configure-command}
...
...
component/apache/mod_antiloris-apache-2.4.patch
0 → 100644
View file @
5135b493
--- mod_antiloris.c.orig 2009-07-28 15:27:42.000000000 +0200
+++ mod_antiloris.c 2012-02-22 11:13:45.132905332 +0100
@@ -22,12 +22,17 @@
#include "http_connection.h"
#include "http_log.h"
#include "ap_mpm.h"
+#include "ap_release.h"
#include "apr_strings.h"
#include "scoreboard.h"
#define MODULE_NAME "mod_antiloris"
#define MODULE_VERSION "0.4"
+#ifdef APLOG_USE_MODULE
+APLOG_USE_MODULE(antiloris);
+#endif
+
module AP_MODULE_DECLARE_DATA antiloris_module;
static int server_limit, thread_limit;
@@ -103,6 +108,7 @@
ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL, MODULE_NAME " " MODULE_VERSION " started");
ap_mpm_query(AP_MPMQ_HARD_LIMIT_THREADS, &thread_limit);
ap_mpm_query(AP_MPMQ_HARD_LIMIT_DAEMONS, &server_limit);
+ ap_add_version_component(p, MODULE_NAME "/" MODULE_VERSION);
return OK;
}
@@ -123,14 +129,18 @@
worker_score *ws_record;
ws_record = &ap_scoreboard_image->servers[sbh->child_num][sbh->thread_num];
- apr_cpystrn(ws_record->client, c->remote_ip, sizeof(ws_record->client));
+ apr_cpystrn(ws_record->client, c->client_ip, sizeof(ws_record->client));
char *client_ip = ws_record->client;
/* Count up the number of connections we are handling right now from this IP address */
for (i = 0; i < server_limit; ++i) {
for (j = 0; j < thread_limit; ++j) {
- ws_record = ap_get_scoreboard_worker(i, j);
+#if AP_SERVER_MAJORVERSION_NUMBER == 2 && AP_SERVER_MINORVERSION_NUMBER > 2
+ ws_record = ap_get_scoreboard_worker_from_indexes(i, j);
+#else
+ ws_record = ap_get_scoreboard_worker(i, j);
+#endif
switch (ws_record->status) {
case SERVER_BUSY_READ:
if (strcmp(client_ip, ws_record->client) == 0)
@@ -143,7 +153,7 @@
}
if (ip_count > conf->limit) {
- ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "Rejected, too many connections in READ state from %s", c->remote_ip);
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "[client %s] Antiloris rejected, too many connections", c->client_ip);
return OK;
} else {
return DECLINED;
@@ -151,17 +161,10 @@
}
-static void child_init (apr_pool_t *p, server_rec *s)
-{
- ap_add_version_component(p, MODULE_NAME "/" MODULE_VERSION);
-}
-
-
static void register_hooks(apr_pool_t *p)
{
ap_hook_post_config(post_config, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_process_connection(pre_connection, NULL, NULL, APR_HOOK_FIRST);
- ap_hook_child_init(child_init, NULL, NULL, APR_HOOK_MIDDLE);
}
module AP_MODULE_DECLARE_DATA antiloris_module = {
slapos/recipe/apache_zope_backend/template/apache.zope.conf.in
View file @
5135b493
...
@@ -2,6 +2,9 @@
...
@@ -2,6 +2,9 @@
# Automatically generated
# Automatically generated
# List of modules
# List of modules
LoadModule unixd_module modules/mod_unixd.so
LoadModule access_compat_module modules/mod_access_compat.so
LoadModule authz_core_module modules/mod_authz_core.so
LoadModule authz_host_module modules/mod_authz_host.so
LoadModule authz_host_module modules/mod_authz_host.so
LoadModule log_config_module modules/mod_log_config.so
LoadModule log_config_module modules/mod_log_config.so
LoadModule setenvif_module modules/mod_setenvif.so
LoadModule setenvif_module modules/mod_setenvif.so
...
@@ -18,7 +21,6 @@ LoadModule headers_module modules/mod_headers.so
...
@@ -18,7 +21,6 @@ LoadModule headers_module modules/mod_headers.so
# Basic server configuration
# Basic server configuration
PidFile "%(pid_file)s"
PidFile "%(pid_file)s"
LockFile "%(lock_file)s"
Listen %(ip)s:%(port)s
Listen %(ip)s:%(port)s
ServerAdmin %(server_admin)s
ServerAdmin %(server_admin)s
TypesConfig conf/mime.types
TypesConfig conf/mime.types
...
...
slapos/recipe/davstorage/template/httpd.conf.in
View file @
5135b493
...
@@ -3,6 +3,9 @@ ServerRoot "%(server_root)s"
...
@@ -3,6 +3,9 @@ ServerRoot "%(server_root)s"
Listen [%(ip)s]:%(port)s
Listen [%(ip)s]:%(port)s
# Needed modules
# Needed modules
LoadModule unixd_module modules/mod_unixd.so
LoadModule access_compat_module modules/mod_access_compat.so
LoadModule authz_core_module modules/mod_authz_core.so
LoadModule authn_file_module "%(modules_dir)s/mod_authn_file.so"
LoadModule authn_file_module "%(modules_dir)s/mod_authn_file.so"
LoadModule authz_host_module "%(modules_dir)s/mod_authz_host.so"
LoadModule authz_host_module "%(modules_dir)s/mod_authz_host.so"
LoadModule authz_user_module "%(modules_dir)s/mod_authz_user.so"
LoadModule authz_user_module "%(modules_dir)s/mod_authz_user.so"
...
@@ -25,7 +28,6 @@ ServerTokens ProductOnly
...
@@ -25,7 +28,6 @@ ServerTokens ProductOnly
DocumentRoot "%(document_root)s"
DocumentRoot "%(document_root)s"
PidFile "%(pid_file)s"
PidFile "%(pid_file)s"
LockFile "%(lock_file)s"
DavLockDB "%(davlock_db)s"
DavLockDB "%(davlock_db)s"
<Directory />
<Directory />
...
...
slapos/recipe/erp5/template/apache.zope.conf.in
View file @
5135b493
...
@@ -2,6 +2,9 @@
...
@@ -2,6 +2,9 @@
# Automatically generated
# Automatically generated
# List of modules
# List of modules
LoadModule unixd_module modules/mod_unixd.so
LoadModule access_compat_module modules/mod_access_compat.so
LoadModule authz_core_module modules/mod_authz_core.so
LoadModule authz_host_module modules/mod_authz_host.so
LoadModule authz_host_module modules/mod_authz_host.so
LoadModule log_config_module modules/mod_log_config.so
LoadModule log_config_module modules/mod_log_config.so
LoadModule setenvif_module modules/mod_setenvif.so
LoadModule setenvif_module modules/mod_setenvif.so
...
@@ -19,7 +22,6 @@ LoadModule antiloris_module modules/mod_antiloris.so
...
@@ -19,7 +22,6 @@ LoadModule antiloris_module modules/mod_antiloris.so
# Basic server configuration
# Basic server configuration
PidFile "%(pid_file)s"
PidFile "%(pid_file)s"
LockFile "%(lock_file)s"
Listen %(ip)s:%(port)s
Listen %(ip)s:%(port)s
ServerAdmin %(server_admin)s
ServerAdmin %(server_admin)s
TypesConfig conf/mime.types
TypesConfig conf/mime.types
...
...
slapos/recipe/lamp/template/apache.in
View file @
5135b493
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
# Basic server configuration
# Basic server configuration
PidFile "%(pid_file)s"
PidFile "%(pid_file)s"
LockFile "%(lock_file)s"
Listen %(ip)s:%(port)s
Listen %(ip)s:%(port)s
PHPINIDir %(php_ini_dir)s
PHPINIDir %(php_ini_dir)s
ServerAdmin someone@email
ServerAdmin someone@email
...
@@ -39,6 +38,9 @@ DocumentRoot %(document_root)s
...
@@ -39,6 +38,9 @@ DocumentRoot %(document_root)s
DirectoryIndex index.html index.php
DirectoryIndex index.html index.php
# List of modules
# List of modules
LoadModule unixd_module modules/mod_unixd.so
LoadModule access_compat_module modules/mod_access_compat.so
LoadModule authz_core_module modules/mod_authz_core.so
LoadModule authz_host_module modules/mod_authz_host.so
LoadModule authz_host_module modules/mod_authz_host.so
LoadModule log_config_module modules/mod_log_config.so
LoadModule log_config_module modules/mod_log_config.so
LoadModule setenvif_module modules/mod_setenvif.so
LoadModule setenvif_module modules/mod_setenvif.so
...
...
slapos/recipe/pulse2/template/apache.in.in
View file @
5135b493
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
# Basic server configuration
# Basic server configuration
PidFile "%(pid_file)s"
PidFile "%(pid_file)s"
LockFile "%(lock_file)s"
Listen %(ip)s:%(port)s
Listen %(ip)s:%(port)s
PHPINIDir %(php_ini_dir)s
PHPINIDir %(php_ini_dir)s
ServerAdmin someone@email
ServerAdmin someone@email
...
@@ -42,6 +41,9 @@ DocumentRoot %(document_root)s
...
@@ -42,6 +41,9 @@ DocumentRoot %(document_root)s
DirectoryIndex index.html index.php
DirectoryIndex index.html index.php
# List of modules
# List of modules
LoadModule unixd_module modules/mod_unixd.so
LoadModule access_compat_module modules/mod_access_compat.so
LoadModule authz_core_module modules/mod_authz_core.so
LoadModule authz_host_module modules/mod_authz_host.so
LoadModule authz_host_module modules/mod_authz_host.so
LoadModule log_config_module modules/mod_log_config.so
LoadModule log_config_module modules/mod_log_config.so
LoadModule setenvif_module modules/mod_setenvif.so
LoadModule setenvif_module modules/mod_setenvif.so
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment