From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27098 invoked by uid 1002); 12 Apr 2003 22:56:52 -0000 Mailing-List: contact gentoo-dev-help@gentoo.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@gentoo.org Received: (qmail 26399 invoked from network); 12 Apr 2003 22:56:52 -0000 From: Benjamin Podszun To: azarah@gentoo.org Cc: Hasse Hagen Johansen , Gentoo-Dev In-Reply-To: <1050186320.4224.51.camel@nosferatu.lan> References: <1050174571.1279.17.camel@blafasel> <200304121524.19816.brian@mdrx.com> <1050179520.1274.24.camel@blafasel> <1050179881.3930.9.camel@nexus6.musikcheck.dk> <1050180243.1280.26.camel@blafasel> <1050186320.4224.51.camel@nosferatu.lan> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-PxyimnD86zdi6GtfrhBN" Organization: Message-Id: <1050188138.4931.51.camel@blafasel> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.2.3- Date: 13 Apr 2003 00:55:38 +0200 Subject: Re: [gentoo-dev] Performance once again.. X-Archives-Salt: bdecd68c-42ae-4ff3-abd2-7fd4c97eea0e X-Archives-Hash: 84a7266229366da7847f8e45c36cb9b5 --=-PxyimnD86zdi6GtfrhBN Content-Type: multipart/mixed; boundary="=-TJhQmOGQ2x0giUwXHUTK" --=-TJhQmOGQ2x0giUwXHUTK Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Attached. On Sun, 2003-04-13 at 00:25, Martin Schlemmer wrote: > On Sat, 2003-04-12 at 22:44, Benjamin Podszun wrote: > > jay:~/apache-1.3.27/debian/patches# ls > > ab_overzealous_connections mime_type_fix > > apxs_assumes_dso mod_bandwidth_paths > > apxs_wrong_prefix phf_dot_log > > custom_response_segfaults =20 > > regex_must_conform_to_posix_for_LFS_to_work > > dbm_part_2_the_revenge server_subversioning > > debian_config_layout suexec_combined > > debian_ps_is_brutal suexec_of_death > > debian_requires_fPIC thetarget_unquoted > > hurd_compile_fix_for_upstream usr_bin_perl_owns_you > >=20 > > Uhm.. That's not really helpful for me... Any other ideas? > >=20 >=20 > Could you attach patches: >=20 > ab_overzealous_connections > mod_bandwidth_paths > suexec_combined > suexec_of_death > usr_bin_perl_owns_you >=20 > Although I do not think the last are related. =20 --=-TJhQmOGQ2x0giUwXHUTK Content-Disposition: attachment; filename=ab_overzealous_connections Content-Transfer-Encoding: quoted-printable Content-Type: text/x-patch; name=ab_overzealous_connections; charset=ISO-8859-15 diff -ruN build-tree/apache_1.3.27/src/support/ab.c build-tree/apache_1.3.2= 6/src/support/ab.c --- build-tree/apache_1.3.27/src/support/ab.c Thu May 18 02:43:06 2000 +++ build-tree/apache_1.3.27/src/support/ab.c Thu May 18 02:36:24 2000 @@ -602,7 +602,8 @@ FD_CLR(c->fd, &writebits); =20 /* connect again */ - start_connect(c); + if(done < requests) + start_connect(c); return; } =20 --=-TJhQmOGQ2x0giUwXHUTK Content-Disposition: attachment; filename=mod_bandwidth_paths Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; name=mod_bandwidth_paths; charset=ISO-8859-15 --- build-tree/apache-contrib-1.0.8/mod_bandwidth/mod_bandwidth.c Fri Aug 2= 0 01:59:02 1999 +++ build-tree/apache-contrib-1.0.8/mod_bandwidth/mod_bandwidth.c.mine Tue = Feb 19 21:28:01 2002 @@ -340,8 +340,8 @@ #define MIN_BW_DEFAULT 256 /* Minimal bandwidth defaulted to 256Bp= s */ #define PACKET 1024 /* Sent packet of 1024 bytes = */ =20 -#define MASTER_DIR "/tmp/apachebw/master" -#define LINK_DIR "/tmp/apachebw/link" +#define MASTER_DIR "/var/lib/apache/mod-bandwidth/master" +#define LINK_DIR "/var/lib/apache/mod-bandwidth/link" =20 #ifdef USE_MMAP_FILES #include @@ -745,7 +745,7 @@ * directory. */ =20 - if (stat(directory, &fdata) < -1) { + if (stat(directory, &fdata) < 0) { /* Dunno if this may happen... but well... */ return DECLINED; } --=-TJhQmOGQ2x0giUwXHUTK Content-Disposition: attachment; filename=suexec_combined Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; name=suexec_combined; charset=ISO-8859-15 --- build-tree/apache_1.3.27/src/support/suexec.c Thu Mar 8 11:11:43 2001 +++ build-tree/apache_1.3.27/src/support/suexec.c Thu Jan 10 21:00:14 2002 @@ -90,6 +90,7 @@ #include =20 #include +#include =20 #include "suexec.h" =20 @@ -165,6 +166,8 @@ "UNIQUE_ID", "USER_NAME", "TZ", + "HTTPS", + "REDIRECT_HTTPS", NULL }; =20 @@ -228,7 +231,8 @@ cidx++; =20 for (ep =3D environ; *ep && cidx < AP_ENVBUF-1; ep++) { - if (!strncmp(*ep, "HTTP_", 5)) { + if (!strncmp(*ep, "HTTP_", 5) || + !strncmp(*ep, "SSL_", 4)) { cleanenv[cidx] =3D *ep; cidx++; } @@ -249,6 +253,244 @@ environ =3D cleanenv; } =20 +#define MY_STATE_NORMAL 0 +#define MY_STATE_SPACE 1 +#define MY_STATE_QUOTES 2 +#define MY_STATE_APOSTROPHES 3 +#define MY_STATE_END 4 + +char** param_separate(char* params, int addl_slots) { + int state, actpos, actarg_start, actarg_len, argnum; + char **res=3D0; + char backslash=3D0; + =20 + if (params=3D=3D0) return(0); + =20 + if (*params=3D=3D0) { + res=3D(char**)malloc(sizeof(char*)*(1+addl_slots)); + for (actpos=3D0;actposserver->server_uid =3D ap_user_id; fprintf(stderr, - "Warning: User directive in " + "ERROR: User directive in " "requires SUEXEC wrapper.\n"); + exit (1); } } #if !defined (BIG_SECURITY_HOLE) && !defined (OS2) @@ -1933,8 +1934,9 @@ else { cmd->server->server_gid =3D ap_group_id; fprintf(stderr, - "Warning: Group directive in requires " + "ERROR: Group directive in requires " "SUEXEC wrapper.\n"); + exit (1); } } =20 --=-TJhQmOGQ2x0giUwXHUTK Content-Disposition: attachment; filename=usr_bin_perl_owns_you Content-Transfer-Encoding: quoted-printable Content-Type: text/x-patch; name=usr_bin_perl_owns_you; charset=ISO-8859-15 diff --minimal --new-file --recursive --show-c-function --unified=3D3 apach= e_1.3.12.old/cgi-bin/printenv apache_1.3.12/cgi-bin/printenv --- build-tree/apache_1.3.27/cgi-bin/printenv Wed Nov 24 12:10:58 1999 +++ build-tree/apache_1.3.27/cgi-bin/printenv Sun Apr 16 09:50:04 2000 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl ## ## printenv -- demo CGI program which just prints its environment ## diff --minimal --new-file --recursive --show-c-function --unified=3D3 apach= e_1.3.12.old/cgi-bin/printenv.~1~ apache_1.3.12/cgi-bin/printenv.~1~ --- build-tree/apache_1.3.27/cgi-bin/printenv.~1~ Wed Dec 31 18:00:00 1969 +++ build-tree/apache_1.3.27/cgi-bin/printenv.~1~ Sun Apr 16 09:49:43 2000 @@ -0,0 +1,13 @@ +#!/usr/local/bin/perl +## +## printenv -- demo CGI program which just prints its environment +## + +print "Content-type: text/plain\n\n"; +foreach $var (sort(keys(%ENV))) { + $val =3D $ENV{$var}; + $val =3D~ s|\n|\\n|g; + $val =3D~ s|"|\\"|g; + print "${var}=3D\"${val}\"\n"; +} + diff --minimal --new-file --recursive --show-c-function --unified=3D3 apach= e_1.3.12.old/src/support/dbmmanage apache_1.3.12/src/support/dbmmanage --- build-tree/apache_1.3.27/src/support/dbmmanage Sun Nov 28 07:37:53 1999 +++ build-tree/apache_1.3.27/src/support/dbmmanage Sun Apr 16 09:49:43 2000 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl =20 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright (c) 1995-1999 The Apache Group. All rights reserved. diff --minimal --new-file --recursive --show-c-function --unified=3D3 apach= e_1.3.12.old/src/support/log_server_status apache_1.3.12/src/support/log_se= rver_status --- build-tree/apache_1.3.27/src/support/log_server_status Fri Jun 4 10:54= :19 1999 +++ build-tree/apache_1.3.27/src/support/log_server_status Sun Apr 16 09:49= :43 2000 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl =20 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright (c) 1995-1999 The Apache Group. All rights reserved. diff --minimal --new-file --recursive --show-c-function --unified=3D3 apach= e_1.3.12.old/src/support/phf_abuse_log.cgi apache_1.3.12/src/support/phf_ab= use_log.cgi --- build-tree/apache_1.3.27/src/support/phf_abuse_log.cgi Tue Oct 8 16:14= :49 1996 +++ build-tree/apache_1.3.27/src/support/phf_abuse_log.cgi Sun Apr 16 09:49= :43 2000 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl =20 # This script can be used to detect people trying to abuse the security ho= le which # existed in A CGI script direstributed with Apache 1.0.3 and earlier vers= ions. --=-TJhQmOGQ2x0giUwXHUTK-- --=-PxyimnD86zdi6GtfrhBN Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQA+mJlpeGGfskjv0zURAmiaAKCQZQaknNvm4msoJB0GVycyK3P9gwCfQRig P5FzcaWumEO3e+lQRYjCHoA= =9Rkp -----END PGP SIGNATURE----- --=-PxyimnD86zdi6GtfrhBN--