summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Herbert <stuart@gentoo.org>2005-03-27 17:27:55 +0000
committerStuart Herbert <stuart@gentoo.org>2005-03-27 17:27:55 +0000
commit244ac0b5351f0c2e033bb4741dd88fe880a6d0ab (patch)
tree98faba363ff67d92f9a30012b89112869c8d1270 /www-servers/thttpd
parentAdded php support (diff)
downloadgentoo-2-244ac0b5351f0c2e033bb4741dd88fe880a6d0ab.tar.gz
gentoo-2-244ac0b5351f0c2e033bb4741dd88fe880a6d0ab.tar.bz2
gentoo-2-244ac0b5351f0c2e033bb4741dd88fe880a6d0ab.zip
Added php support
(Portage version: 2.0.51.19)
Diffstat (limited to 'www-servers/thttpd')
-rw-r--r--www-servers/thttpd/ChangeLog10
-rw-r--r--www-servers/thttpd/files/digest-thttpd-2.25b-r22
-rw-r--r--www-servers/thttpd/files/php-5.0.3-IOV.patch12
-rw-r--r--www-servers/thttpd/files/php-5.0.3-missing-arches.patch13
-rw-r--r--www-servers/thttpd/files/php5.0-stdint.diff11
-rw-r--r--www-servers/thttpd/files/php5_soap_persistence_session.diff35
-rw-r--r--www-servers/thttpd/files/thttpd-2.25/php-5.0.3-thttpd-2.25b.patch337
-rw-r--r--www-servers/thttpd/thttpd-2.25b-r2.ebuild4
8 files changed, 421 insertions, 3 deletions
diff --git a/www-servers/thttpd/ChangeLog b/www-servers/thttpd/ChangeLog
index f286998f2fed..225c0d5fadbb 100644
--- a/www-servers/thttpd/ChangeLog
+++ b/www-servers/thttpd/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for www-servers/thttpd
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.5 2005/03/08 14:42:54 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.6 2005/03/27 17:26:44 stuart Exp $
+
+*thttpd-2.25b-r2 (27 Mar 2005)
+
+ 27 Mar 2005; Stuart Herbert <stuart@gentoo.org> +files/php-5.0.3-IOV.patch,
+ +files/php-5.0.3-missing-arches.patch, +files/php5.0-stdint.diff,
+ +files/php5_soap_persistence_session.diff,
+ +files/thttpd-2.25/php-5.0.3-thttpd-2.25b.patch, +thttpd-2.25b-r2.ebuild:
+ Added php support (requested by Solar)
*thttpd-2.25b-r1 (08 Mar 2005)
diff --git a/www-servers/thttpd/files/digest-thttpd-2.25b-r2 b/www-servers/thttpd/files/digest-thttpd-2.25b-r2
new file mode 100644
index 000000000000..70bff3b46360
--- /dev/null
+++ b/www-servers/thttpd/files/digest-thttpd-2.25b-r2
@@ -0,0 +1,2 @@
+MD5 a0e9cd87455d3a0ea11e5ea7e947adf6 thttpd-2.25b.tar.gz 132363
+MD5 bf89557056ce34d502e20e24071616c7 php-5.0.3.tar.gz 5666998
diff --git a/www-servers/thttpd/files/php-5.0.3-IOV.patch b/www-servers/thttpd/files/php-5.0.3-IOV.patch
new file mode 100644
index 000000000000..abd83e282b46
--- /dev/null
+++ b/www-servers/thttpd/files/php-5.0.3-IOV.patch
@@ -0,0 +1,12 @@
+diff -u --recursive php-5.0.3-orig/sapi/thttpd/thttpd.c php-5.0.3/sapi/thttpd/thttpd.c
+--- php-5.0.3-orig/sapi/thttpd/thttpd.c 2005-03-27 17:25:59.491818008 +0100
++++ php-5.0.3/sapi/thttpd/thttpd.c 2005-03-27 17:26:36.943124544 +0100
+@@ -107,7 +107,7 @@
+ {
+ int n;
+
+- assert(nvec <= IOV_MAX);
++ /* assert(nvec <= IOV_MAX); */
+
+ if (TG(sbuf).c == 0) {
+ PHP_SYS_CALL(n = writev(TG(hc)->conn_fd, vec, nvec););
diff --git a/www-servers/thttpd/files/php-5.0.3-missing-arches.patch b/www-servers/thttpd/files/php-5.0.3-missing-arches.patch
new file mode 100644
index 000000000000..86c5e067401e
--- /dev/null
+++ b/www-servers/thttpd/files/php-5.0.3-missing-arches.patch
@@ -0,0 +1,13 @@
+Silly php devs forgot about poor old ia64/s390 :(
+
+--- php-5.0.3/Zend/zend_strtod.c
++++ php-5.0.3/Zend/zend_strtod.c
+@@ -99,7 +99,7 @@
+ defined(__mips__) || defined(__ns32k__) || defined(__alpha__) || \
+ defined(__powerpc__) || defined(__ppc__) || defined(__m88k__) || \
+ defined(__hppa__) || defined(__x86_64__) || (defined(__arm__) && \
+- defined(__VFP_FP__))
++ defined(__VFP_FP__)) || defined(__ia64__) || defined(__s390__)
+ #include <sys/types.h>
+ #if BYTE_ORDER == BIG_ENDIAN
+ #define IEEE_BIG_ENDIAN
diff --git a/www-servers/thttpd/files/php5.0-stdint.diff b/www-servers/thttpd/files/php5.0-stdint.diff
new file mode 100644
index 000000000000..451d7fb44cf3
--- /dev/null
+++ b/www-servers/thttpd/files/php5.0-stdint.diff
@@ -0,0 +1,11 @@
+diff -Nura php-4.3.10/Zend/zend_strtod.c php-4.3.10.stdint/Zend/zend_strtod.c
+--- php-4.3.10/Zend/zend_strtod.c 2004-12-14 05:35:26.000000000 -0300
++++ php-4.3.10.stdint/Zend/zend_strtod.c 2004-12-16 15:33:47.000000000 -0300
+@@ -128,6 +128,7 @@
+ #endif
+
+ #if defined(__sparc__) || defined(__ppc__)
++#include <stdint.h>
+ #define u_int32_t uint32_t
+ #endif
+
diff --git a/www-servers/thttpd/files/php5_soap_persistence_session.diff b/www-servers/thttpd/files/php5_soap_persistence_session.diff
new file mode 100644
index 000000000000..626ac67f9081
--- /dev/null
+++ b/www-servers/thttpd/files/php5_soap_persistence_session.diff
@@ -0,0 +1,35 @@
+diff -ruN php-5.0.0RC3.orig/ext/soap/soap.c php-5.0.0RC3/ext/soap/soap.c
+--- php-5.0.0RC3.orig/ext/soap/soap.c 2004-06-22 19:35:59.801348936 +0300
++++ php-5.0.0RC3/ext/soap/soap.c 2004-06-29 13:39:00.506820928 +0300
+@@ -1341,16 +1341,21 @@
+ soap_obj = NULL;
+ #if HAVE_PHP_SESSION
+ /* If persistent then set soap_obj from from the previous created session (if available) */
++ char soapname[32+sizeof("_bogus_session_name")]; //Now we use max 32 chars from class name, must be overwriten with dynamic allocation with exact length!!
+ if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) {
+ zval **tmp_soap;
+
++ bzero(soapname,32+sizeof("_bogus_session_name"));
++ strncpy(soapname,service->soap_class.ce->name,32);
++ strcat(soapname,"_bogus_session_name");
++
+ if (PS(session_status) != php_session_active &&
+ PS(session_status) != php_session_disabled) {
+ php_session_start(TSRMLS_C);
+ }
+
+ /* Find the soap object and assign */
+- if (zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), "_bogus_session_name", sizeof("_bogus_session_name"), (void **) &tmp_soap) == SUCCESS &&
++ if (zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), soapname, sizeof(soapname), (void **) &tmp_soap) == SUCCESS &&
+ Z_TYPE_PP(tmp_soap) == IS_OBJECT &&
+ Z_OBJCE_PP(tmp_soap) == service->soap_class.ce) {
+ soap_obj = *tmp_soap;
+@@ -1432,7 +1437,7 @@
+ /* If session then update session hash with new object */
+ if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) {
+ zval **tmp_soap_pp;
+- if (zend_hash_update(Z_ARRVAL_P(PS(http_session_vars)), "_bogus_session_name", sizeof("_bogus_session_name"), &tmp_soap, sizeof(zval *), (void **)&tmp_soap_pp) == SUCCESS) {
++ if (zend_hash_update(Z_ARRVAL_P(PS(http_session_vars)), soapname, sizeof(soapname), &tmp_soap, sizeof(zval *), (void **)&tmp_soap_pp) == SUCCESS) {
+ soap_obj = *tmp_soap_pp;
+ }
+ } else {
diff --git a/www-servers/thttpd/files/thttpd-2.25/php-5.0.3-thttpd-2.25b.patch b/www-servers/thttpd/files/thttpd-2.25/php-5.0.3-thttpd-2.25b.patch
new file mode 100644
index 000000000000..f32e1a8ba84e
--- /dev/null
+++ b/www-servers/thttpd/files/thttpd-2.25/php-5.0.3-thttpd-2.25b.patch
@@ -0,0 +1,337 @@
+diff -urN php-5.0.3/configure php-5.0.3-thttpd/configure
+--- php-5.0.3/configure 2004-07-13 22:13:15.000000000 +0300
++++ php-5.0.3-thttpd/configure 2004-07-28 08:05:48.021849513 +0300
+@@ -9573,11 +9573,13 @@
+ if grep thttpd.2.21b $withval/version.h >/dev/null; then
+ patch="test -f $THTTPD/php_patched || \
+ (cd $THTTPD && patch -p1 < $abs_srcdir/sapi/thttpd/thttpd_patch && touch php_patched)"
+-
++ elif grep thttpd.2.25b $withval/version.h >/dev/null; then
++ patch="test -f $THTTPD/php_patched || \
++ (cd $THTTPD && patch -p1 < $abs_srcdir/sapi/thttpd/thttpd-2.25b_patch && touch php_patched)"
+ elif grep Premium $withval/version.h >/dev/null; then
+ patch=
+ else
+- { echo "configure: error: This version only supports thttpd-2.21b and Premium thttpd" 1>&2; exit 1; }
++ { echo "configure: error: This version only supports thttpd-2.21b, thttpd-2.25b and Premium thttpd" 1>&2; exit 1; }
+ fi
+
+ if test -n "$GCC"; then
+diff -urN php-5.0.3/sapi/thttpd/thttpd-2.25b_patch php-5.0.3-thttpd/sapi/thttpd/thttpd-2.25b_patch
+--- php-5.0.3/sapi/thttpd/thttpd-2.25b_patch 1970-01-01 02:00:00.000000000 +0200
++++ php-5.0.3-thttpd/sapi/thttpd/thttpd-2.25b_patch 2004-07-28 08:02:52.632236518 +0300
+@@ -0,0 +1,314 @@
++diff -ru thttpd-2.25b.orig/Makefile.in thttpd-2.25b/Makefile.in
++--- thttpd-2.25b.orig/Makefile.in Wed Apr 3 11:49:35 2002
+++++ thttpd-2.25b/Makefile.in Wed Mar 17 17:48:53 2004
++@@ -46,13 +46,15 @@
++
++ # You shouldn't need to edit anything below here.
++
+++include php_makefile
+++
++ CC = @CC@
++ CCOPT = @V_CCOPT@
++ DEFS = @DEFS@
++-INCLS = -I.
+++INCLS = -I. $(PHP_CFLAGS)
++ CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
++-LDFLAGS = @LDFLAGS@
++-LIBS = @LIBS@
+++LDFLAGS = @LDFLAGS@ $(PHP_LDFLAGS)
+++LIBS = @LIBS@ $(PHP_LIBS)
++ NETLIBS = @V_NETLIBS@
++ INSTALL = @INSTALL@
++
++@@ -62,7 +64,7 @@
++ @rm -f $@
++ $(CC) $(CFLAGS) -c $*.c
++
++-SRC = thttpd.c libhttpd.c fdwatch.c mmc.c timers.c match.c tdate_parse.c
+++SRC = thttpd.c libhttpd.c fdwatch.c mmc.c timers.c match.c tdate_parse.c php_thttpd.c
++
++ OBJ = $(SRC:.c=.o) @LIBOBJS@
++
++@@ -77,7 +79,7 @@
++ all: this subdirs
++ this: $(ALL)
++
++-thttpd: $(OBJ)
+++thttpd: $(OBJ) libphp5.a
++ @rm -f $@
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) $(NETLIBS)
++
++diff -ru thttpd-2.25b.orig/config.h thttpd-2.25b/config.h
++--- thttpd-2.25b.orig/config.h Sun Nov 30 12:40:00 2003
+++++ thttpd-2.25b/config.h Wed Mar 17 18:16:57 2004
++@@ -333,7 +333,7 @@
++ /* CONFIGURE: A list of index filenames to check. The files are searched
++ ** for in this order.
++ */
++-#define INDEX_NAMES "index.html", "index.htm", "index.xhtml", "index.xht", "Default.htm", "index.cgi"
+++#define INDEX_NAMES "index.php", "index.html", "index.htm", "index.xhtml", "index.xht", "Default.htm", "index.cgi"
++
++ /* CONFIGURE: If this is defined then thttpd will automatically generate
++ ** index pages for directories that don't have an explicit index file.
++diff -ru thttpd-2.25b.orig/configure thttpd-2.25b/configure
++--- thttpd-2.25b.orig/configure Fri Dec 26 03:44:33 2003
+++++ thttpd-2.25b/configure Wed Mar 17 17:52:14 2004
++@@ -1021,7 +1021,7 @@
++ fi
++ echo "$ac_t""$CPP" 1>&6
++
++-for ac_hdr in fcntl.h grp.h memory.h paths.h poll.h sys/poll.h sys/devpoll.h sys/event.h osreldate.h
+++for ac_hdr in fcntl.h grp.h memory.h paths.h poll.h sys/poll.h sys/devpoll.h sys/event.h osreldate.h netinet/tcp.h
++ do
++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++diff -ru thttpd-2.25b.orig/configure.in thttpd-2.25b/configure.in
++--- thttpd-2.25b.orig/configure.in Fri Dec 26 03:41:13 2003
+++++ thttpd-2.25b/configure.in Wed Mar 17 17:53:20 2004
++@@ -64,7 +64,7 @@
++ AC_MSG_RESULT(no)
++ fi
++
++-AC_CHECK_HEADERS(fcntl.h grp.h memory.h paths.h poll.h sys/poll.h sys/devpoll.h sys/event.h osreldate.h)
+++AC_CHECK_HEADERS(fcntl.h grp.h memory.h paths.h poll.h sys/poll.h sys/devpoll.h sys/event.h osreldate.h netinet/tcp.h)
++ AC_HEADER_TIME
++ AC_HEADER_DIRENT
++
++diff -ru thttpd-2.25b.orig/libhttpd.c thttpd-2.25b/libhttpd.c
++--- thttpd-2.25b.orig/libhttpd.c Fri Dec 26 04:06:05 2003
+++++ thttpd-2.25b/libhttpd.c Sun Mar 21 18:44:02 2004
++@@ -55,6 +55,10 @@
++ #include <unistd.h>
++ #include <stdarg.h>
++
+++#ifdef HAVE_NETINET_TCP_H
+++#include <netinet/tcp.h>
+++#endif
+++
++ #ifdef HAVE_OSRELDATE_H
++ #include <osreldate.h>
++ #endif /* HAVE_OSRELDATE_H */
++@@ -84,6 +88,8 @@
++ #include "match.h"
++ #include "tdate_parse.h"
++
+++#include "php_thttpd.h"
+++
++ #ifndef STDIN_FILENO
++ #define STDIN_FILENO 0
++ #endif
++@@ -214,6 +220,10 @@
++ free( (void*) hs->cwd );
++ if ( hs->cgi_pattern != (char*) 0 )
++ free( (void*) hs->cgi_pattern );
+++ if ( hs->php_pattern != (char*) 0 )
+++ free( (void*) hs->php_pattern );
+++ if ( hs->phps_pattern != (char*) 0 )
+++ free( (void*) hs->phps_pattern );
++ if ( hs->charset != (char*) 0 )
++ free( (void*) hs->charset );
++ if ( hs->p3p != (char*) 0 )
++@@ -223,6 +233,7 @@
++ if ( hs->local_pattern != (char*) 0 )
++ free( (void*) hs->local_pattern );
++ free( (void*) hs );
+++ thttpd_php_shutdown();
++ }
++
++
++@@ -232,7 +243,7 @@
++ unsigned short port, char* cgi_pattern, int cgi_limit, char* charset,
++ char* p3p, int max_age, char* cwd, int no_log, FILE* logfp,
++ int no_symlink_check, int vhost, int global_passwd, char* url_pattern,
++- char* local_pattern, int no_empty_referers )
+++ char* local_pattern, int no_empty_referers, char* php_pattern, char* phps_pattern )
++ {
++ httpd_server* hs;
++ static char ghnbuf[256];
++@@ -279,6 +290,8 @@
++ }
++
++ hs->port = port;
+++ hs->php_pattern = strdup(php_pattern);
+++ hs->phps_pattern = strdup(phps_pattern);
++ if ( cgi_pattern == (char*) 0 )
++ hs->cgi_pattern = (char*) 0;
++ else
++@@ -357,6 +370,7 @@
++ }
++
++ init_mime();
+++ thttpd_php_init();
++
++ /* Done initializing. */
++ if ( hs->binding_hostname == (char*) 0 )
++@@ -1380,6 +1394,8 @@
++ if ( hc->tildemapped )
++ return 1;
++
+++ if ( hc->hostname[0] == '.' || strchr( hc->hostname, '/' ) != (char*) 0 )
+++ return 0;
++ /* Figure out the host directory. */
++ #ifdef VHOST_DIRLEVELS
++ httpd_realloc_str(
++@@ -1488,7 +1504,7 @@
++ restlen = strlen( path );
++ httpd_realloc_str( &rest, &maxrest, restlen );
++ (void) strcpy( rest, path );
++- if ( rest[restlen - 1] == '/' )
+++ if ( restlen > 0 && rest[restlen - 1] == '/' )
++ rest[--restlen] = '\0'; /* trim trailing slash */
++ if ( ! tildemapped )
++ /* Remove any leading slashes. */
++@@ -2438,7 +2454,9 @@
++ {
++ make_log_entry( hc, nowP );
++
++- if ( hc->file_address != (char*) 0 )
+++ if ( hc->file_address == (char*) 1 )
+++ thttpd_closed_conn(hc->conn_fd);
+++ else if ( hc->file_address != (char*) 0 )
++ {
++ mmc_unmap( hc->file_address, &(hc->sb), nowP );
++ hc->file_address = (char*) 0;
++@@ -3786,6 +3804,14 @@
++ ( hc->sb.st_mode & S_IXOTH ) &&
++ match( hc->hs->cgi_pattern, hc->expnfilename ) )
++ return cgi( hc );
+++
+++ if ( hc->hs->php_pattern != (char*) 0 &&
+++ match( hc->hs->php_pattern, hc->expnfilename ) )
+++ return thttpd_php_request( hc, 0 );
+++
+++ if ( hc->hs->phps_pattern != (char*) 0 &&
+++ match( hc->hs->phps_pattern, hc->expnfilename ) )
+++ return thttpd_php_request( hc, 1 );
++
++ /* It's not CGI. If it's executable or there's pathinfo, someone's
++ ** trying to either serve or run a non-CGI file as CGI. Either case
++diff -ru thttpd-2.25b.orig/libhttpd.h thttpd-2.25b/libhttpd.h
++--- thttpd-2.25b.orig/libhttpd.h Tue Dec 9 01:20:51 2003
+++++ thttpd-2.25b/libhttpd.h Wed Mar 17 20:49:34 2004
++@@ -73,6 +73,8 @@
++ char* cgi_pattern;
++ int cgi_limit, cgi_count;
++ char* charset;
+++ char* php_pattern;
+++ char* phps_pattern;
++ char* p3p;
++ int max_age;
++ char* cwd;
++@@ -174,7 +176,7 @@
++ unsigned short port, char* cgi_pattern, int cgi_limit, char* charset,
++ char* p3p, int max_age, char* cwd, int no_log, FILE* logfp,
++ int no_symlink_check, int vhost, int global_passwd, char* url_pattern,
++- char* local_pattern, int no_empty_referers );
+++ char* local_pattern, int no_empty_referers, char* php_pattern, char* phps_pattern );
++
++ /* Change the log file. */
++ extern void httpd_set_logfp( httpd_server* hs, FILE* logfp );
++diff -ru thttpd-2.25b.orig/php_thttpd.c thttpd-2.25b/php_thttpd.c
++--- thttpd-2.25b.orig/php_thttpd.c Sun Mar 21 18:33:30 2004
+++++ thttpd-2.25b/php_thttpd.c Sun Mar 21 20:29:44 2004
++@@ -220,12 +220,12 @@
++ h = zend_llist_get_next_ex(&sapi_headers->headers, &pos);
++ }
++
++- if (TG(seen_cl) && !TG(seen_cn) && TG(hc)->do_keep_alive) {
+++ /*if (TG(seen_cl) && !TG(seen_cn) && TG(hc)->do_keep_alive) {
++ ADD_VEC(KA_DO, sizeof(KA_DO)-1);
++ } else {
++ TG(hc)->do_keep_alive = 0;
++ ADD_VEC(KA_NO, sizeof(KA_NO)-1);
++- }
+++ }*/
++
++ ADD_VEC("\r\n", 2);
++
++@@ -656,12 +656,12 @@
++
++ if (hc->contentlength != -1) {
++ hc->should_linger = 1;
++- hc->do_keep_alive = 0;
+++ /*hc->do_keep_alive = 0;*/
++ }
++
++ if (hc->contentlength != -1
++ && SIZEOF_UNCONSUMED_BYTES() < hc->contentlength) {
++- hc->read_body_into_mem = 1;
+++ /*hc->read_body_into_mem = 1;*/
++ return 0;
++ }
++
++@@ -670,9 +670,9 @@
++ thttpd_module_main(show_source TSRMLS_CC);
++
++ /* disable kl, if no content-length was seen or Connection: was set */
++- if (TG(seen_cl) == 0 || TG(seen_cn) == 1) {
+++ /*if (TG(seen_cl) == 0 || TG(seen_cn) == 1) {
++ TG(hc)->do_keep_alive = 0;
++- }
+++ }*/
++
++ if (TG(sbuf).c != 0) {
++ if (TG(hc)->response)
++diff -ru thttpd-2.25b.orig/thttpd.c thttpd-2.25b/thttpd.c
++--- thttpd-2.25b.orig/thttpd.c Fri Dec 26 04:06:52 2003
+++++ thttpd-2.25b/thttpd.c Sun Mar 21 18:11:33 2004
++@@ -77,6 +77,8 @@
++ static int do_chroot, no_log, no_symlink_check, do_vhost, do_global_passwd;
++ static char* cgi_pattern;
++ static int cgi_limit;
+++static char* php_pattern;
+++static char* phps_pattern;
++ static char* url_pattern;
++ static int no_empty_referers;
++ static char* local_pattern;
++@@ -642,7 +644,7 @@
++ gotv4 ? &sa4 : (httpd_sockaddr*) 0, gotv6 ? &sa6 : (httpd_sockaddr*) 0,
++ port, cgi_pattern, cgi_limit, charset, p3p, max_age, cwd, no_log, logfp,
++ no_symlink_check, do_vhost, do_global_passwd, url_pattern,
++- local_pattern, no_empty_referers );
+++ local_pattern, no_empty_referers, php_pattern, phps_pattern );
++ if ( hs == (httpd_server*) 0 )
++ exit( 1 );
++
++@@ -869,6 +871,8 @@
++ #else /* CGI_LIMIT */
++ cgi_limit = 0;
++ #endif /* CGI_LIMIT */
+++ php_pattern = "**.php";
+++ phps_pattern = "**.phps";
++ url_pattern = (char*) 0;
++ no_empty_referers = 0;
++ local_pattern = (char*) 0;
++@@ -1103,6 +1107,16 @@
++ {
++ value_required( name, value );
++ cgi_limit = atoi( value );
+++ }
+++ else if ( strcasecmp( name, "phppat" ) == 0 )
+++ {
+++ value_required( name, value );
+++ php_pattern = e_strdup( value );
+++ }
+++ else if ( strcasecmp( name, "phpspat" ) == 0 )
+++ {
+++ value_required( name, value );
+++ phps_pattern = e_strdup( value );
++ }
++ else if ( strcasecmp( name, "urlpat" ) == 0 )
++ {
++diff -ru thttpd-2.25b.orig/version.h thttpd-2.25b/version.h
++--- thttpd-2.25b.orig/version.h Tue Dec 30 02:02:40 2003
+++++ thttpd-2.25b/version.h Sun Mar 21 22:31:24 2004
++@@ -3,7 +3,8 @@
++ #ifndef _VERSION_H_
++ #define _VERSION_H_
++
++-#define SERVER_SOFTWARE "thttpd/2.25b 29dec2003"
+++#include "php_version.h"
+++#define SERVER_SOFTWARE "thttpd/2.25b PHP/" PHP_VERSION
++ #define SERVER_ADDRESS "http://www.acme.com/software/thttpd/"
++
++ #endif /* _VERSION_H_ */
diff --git a/www-servers/thttpd/thttpd-2.25b-r2.ebuild b/www-servers/thttpd/thttpd-2.25b-r2.ebuild
index 305208cdd0d6..12311a86853a 100644
--- a/www-servers/thttpd/thttpd-2.25b-r2.ebuild
+++ b/www-servers/thttpd/thttpd-2.25b-r2.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.25b-r2.ebuild,v 1.1 2005/03/27 17:26:44 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.25b-r2.ebuild,v 1.2 2005/03/27 17:27:55 stuart Exp $
PHPSAPI="thttpd"
MY_PHP_P="php-5.0.3"
MY_THTTPD_P="${P%[a-z]*}"
-inherit php5-sapi-r1 flag-o-matic
+inherit php5-sapi-r2 flag-o-matic
DESCRIPTION="Small and fast multiplexing webserver."
HOMEPAGE="http://www.acme.com/software/thttpd/"