Commit Graph

1196 Commits

Author SHA1 Message Date
Sascha Schumann
eb0141913c Add two missing entries 2002-11-07 11:38:03 +00:00
Sascha Schumann
10a861f93c - use TCP_DEFER_ACCEPT
- don't timeout connections which are managed by IRCG
- don't generate invalid HTTP replies, if the client did not send a
  request line yet
2002-11-06 17:31:03 +00:00
Ilia Alshanetsky
64f77577f0 Fixed bug #20035. ZE now allows us to pass the current line position by
setting zend_lineno to (current_line * -1).
2002-11-05 22:04:12 +00:00
Marcus Boerger
64d3e88266 call php_module_startup after zts has been initialised. This way we could
have called zend_ini_deactivate(TSRMLS_C). But it seems unnecessary.
#tested with ZTS and non ZTS build and many manual fail points.
#now it even compiles without any warning, at least for me
2002-11-05 15:15:51 +00:00
Edin Kadribasic
608d4ded77 Moving php/embed windows build files to sapi/embed folder. 2002-11-05 13:12:27 +00:00
Edin Kadribasic
9276b276f7 Made php -v output look nicer on standard 80 column display. 2002-11-05 11:13:35 +00:00
Sascha Schumann
3f7081c439 Fix debugging description 2002-11-04 13:22:23 +00:00
Ilia Alshanetsky
4886072b4b Fixed bug #20217. When php_flag & php_value are used, the PHP_INI_PERDIR
flag should be used when setting the ini value. Otherwise, the user cannot
modify per-directory ini settings specified via .htaccess.
2002-11-02 23:08:20 +00:00
James Cox
a63d607f08 adding id tags 2002-11-02 16:04:27 +00:00
Sascha Schumann
b39ca47d20 syntax highlighting has been added 2002-11-02 13:47:27 +00:00
Sascha Schumann
68bb574637 add missing }}} closure 2002-11-02 04:53:31 +00:00
Sascha Schumann
ac4d1a1927 fix obvious copy&paste error 2002-11-02 04:35:25 +00:00
Sascha Schumann
082d9c4936 Simplify handler dispatching mechanism 2002-11-01 11:51:35 +00:00
Sascha Schumann
1a7a5b3982 Add missing return statement. 2002-11-01 11:44:50 +00:00
Sascha Schumann
1d2eb7c485 update 2002-11-01 11:41:08 +00:00
Sascha Schumann
7d504b230c improve host header checking, only affects systems which have virtual
hosting enabled
2002-11-01 11:40:26 +00:00
foobar
b79e506045 Added built date and time to -v output. 2002-10-31 17:34:10 +00:00
Sascha Schumann
55879b3543 first step towards asynchronous content body processing 2002-10-30 19:09:49 +00:00
Sascha Schumann
ed15104099 s/-// 2002-10-26 22:27:45 +00:00
Sascha Schumann
40b93fa16d add phppat/phpspat configuration file support and
fix some indention
2002-10-26 22:22:34 +00:00
Sascha Schumann
e077e0debe update and extend 2002-10-26 22:22:07 +00:00
Ilia Alshanetsky
d5870ef544 Added a sanity check (hopefuly will fix bug #20109). According to
http://developer.netscape.com/docs/manuals/enterprise/40/nsapi/05_nsapi.htm#551539
util_hostname() can return a NULL value.
2002-10-26 22:00:36 +00:00
Sascha Schumann
7a0850a344 Fix build and .phps support 2002-10-26 21:06:10 +00:00
Sascha Schumann
01bdc2e369 experimental .phps support 2002-10-26 20:55:41 +00:00
Sascha Schumann
c46ed2114e not sure what this async_send is doing in here, so relieve it from its duty. 2002-10-26 20:45:35 +00:00
Sascha Schumann
7b3bea0b41 Donate "Fast Accept Loop" from Premium thttpd which speeds up processing
new connections when the connection table contains lots of entries.
2002-10-26 19:41:27 +00:00
Ilia Alshanetsky
3a1c278361 Fixed memory leaks. 2002-10-26 19:33:15 +00:00
Sascha Schumann
467fea036a Donate "Periodic Connection Expiring" from Premium thttpd, because
it is simple and gives a +40% improvement in terms of requests/s
when serving static files.
2002-10-26 18:14:45 +00:00
Sascha Schumann
b9135d74e9 some system headers (irix) define sa_len
prefix sa_len with x
2002-10-26 15:47:22 +00:00
Derick Rethans
d82565fb7a - Fix build
#- Jan, please TEST! before committing :-)
2002-10-25 14:33:46 +00:00
Jan Lehnardt
e431d6a1c9 - alphabetical output for php -h (cli) 2002-10-25 09:32:32 +00:00
Jan Lehnardt
ed29169f91 - alphabetcial output for php -h (cgi)
- cosmetics
2002-10-25 09:28:55 +00:00
Sascha Schumann
0a80a78670 thttpd initializes contentlength to -1, so we need to transfer that to 0
for SAPI/PHP.  Otherwise, SAPI will try to read (unsigned long) -1 bytes
from the connection.
2002-10-25 01:10:50 +00:00
Sascha Schumann
d464b8164c add missing {} 2002-10-24 16:04:31 +00:00
Derick Rethans
1f9f9244eb - whitespace 2002-10-24 14:01:39 +00:00
Sascha Schumann
1e3e07173b Improve shutdown-behaviour
Noticed by: Anantha Kesari H Y
2002-10-24 13:25:57 +00:00
Derick Rethans
337649a5f2 *** empty log message *** 2002-10-24 13:18:27 +00:00
Sascha Schumann
2909e5c9c9 centralize #include "build-defs.h" and drop (sometimes inconsistent) other
instances
2002-10-24 13:15:49 +00:00
Moriyoshi Koizumi
f2f19761a5 Forgot this one. 2002-10-23 18:34:57 +00:00
Sascha Schumann
d554b8d3ab Maintain appropiate line breaks 2002-10-23 10:11:38 +00:00
Yasuo Ohgaki
d253364a13 Make CLI behave like other moder scripting languages. 2002-10-23 01:21:40 +00:00
Ilia Alshanetsky
5c53cdafcb Fixed a bug that caused the values of options/flags set via
httpd.conf/.htaccess and other apache methods to contain a \0 as part of the
value.
2002-10-22 14:02:14 +00:00
Ilia Alshanetsky
f7b15b0611 Added support for 'engine Off' directive
Added support for 'none' option for *_value options.
2002-10-22 12:20:12 +00:00
Hartmut Holzgraefe
c4cb92229c this will be handled elsewhere 2002-10-21 20:20:08 +00:00
foobar
9d21dd450d - Moved CGI specific lines from configure.in to sapi/cgi/config9.m4
which is 'executed' last of the SAPI config.m4's.
- Added --disable-cgi option. (was possible only with above change)
- Made the sed check to not test for the possibly working sed on Solaris
  since that would make the test quite useless. (compile would still fail)

# That sed check is not enabled yet..need to know whether we fail
# during configure or just put out a warning about possible non-working
# sed. As even plain ./configure doesn't work in most cases, I think
# it would be better to just fail during configure and let the users
# fix their paths/install GNU sed.
2002-10-21 03:12:27 +00:00
Ilia Alshanetsky
8361687a4a Fixed a bug with .phps handler. 2002-10-16 20:45:36 +00:00
Edin Kadribasic
4f9b61aa9f Respect INSTALL_ROOT var. Thanks to Jani for catching this one. 2002-10-14 22:18:35 +00:00
Derick Rethans
1bb702e403 - Revert, got tricked by a stale object file 2002-10-14 11:59:58 +00:00
Edin Kadribasic
06484d6eb2 Install lib into $(prefix)/lib.
Make $(prefix)/lib before trying to copy the lib into it.
2002-10-14 09:05:28 +00:00
Derick Rethans
092f78fc28 - Fix CLI 2002-10-14 06:58:57 +00:00
Sascha Schumann
47a1421d89 Redo the patch on Linux, the cygwin diff seems to be a bit broken. 2002-10-13 11:54:08 +00:00
Sascha Schumann
356f7503fa PHP + thttpd (+IRCG) build using CYGWIN now 2002-10-13 11:50:16 +00:00
Sascha Schumann
4f61b16768 Remove set .x 2002-10-13 11:28:34 +00:00
Sascha Schumann
240cdb743e Use if block rather than an or expression 2002-10-13 11:28:06 +00:00
Shane Caraveo
69f56e8c4a make fastcgi usage threadsafe, ready for future multithreaded fastcgi implementation
get rid of environment overwriting but hooking into php's environment function
set $_ENV correctly for mod_fastcgi
add -b to specify binding for fastcgi
new readme file with information for running under apache2.0 and iis
2002-10-13 09:40:44 +00:00
Shane Caraveo
acb9bc95e3 fixes for unix, untested
remove exit calls
fix a couple function definitions
2002-10-13 08:34:27 +00:00
Shane Caraveo
2b40a0f2a3 fix shutdown issues 2002-10-13 07:23:17 +00:00
Shane Caraveo
bfd3efcbd3 fix invalid handle issue that shutdown php fastcgi prematurly
fix checking os name for impersonation
2002-10-13 05:55:03 +00:00
foobar
068907c9bc - Removed sapi/fhttpd (this webserver is dead) 2002-10-12 23:02:43 +00:00
foobar
534ad6f38f Use AC_ARG_WITH instead of PHP_ARG_WITH. 2002-10-12 03:10:04 +00:00
foobar
ac950497a6 Fix typo 2002-10-12 02:50:16 +00:00
foobar
ba3730c2c8 ws fix 2002-10-12 01:48:47 +00:00
Edin Kadribasic
67da691a13 Added .cvsignore and CREDITS. 2002-10-12 01:30:52 +00:00
foobar
204b3b5fbd Add the proper install lines. 2002-10-12 01:18:04 +00:00
foobar
7a3f2eb63b Default to shared. 2002-10-12 00:54:53 +00:00
foobar
49488cfd0d - Removed the unnecessary extra configure option --enable-shared-embed
- Changed --enable-embed to accept parameters shared/static and default
  to static build.
2002-10-11 23:28:01 +00:00
Rasmus Lerdorf
204c64e57f zlib.h being included before ssl.h needs to be handled here too 2002-10-08 00:13:56 +00:00
Sebastian Bergmann
8684c06b6d Add note about javax.servlet package. 2002-10-06 06:27:13 +00:00
Ilia Alshanetsky
29be52fbfb A slightly better content-type check. 2002-10-04 21:31:34 +00:00
Ilia Alshanetsky
5f67f05d92 Added a note on how to enable .phps support. 2002-10-04 21:22:13 +00:00
Ilia Alshanetsky
9f2b70d507 Added .phps support to Apache 2. It can be enabled by adding
AddType application/x-httpd-php-source .phps
to httpd.conf
2002-10-04 21:15:59 +00:00
Derick Rethans
9b517c4b93 - Revert changed to implicit_flush behavior. The new behavior was not
intended in the first place.
2002-10-03 10:35:33 +00:00
Yasuo Ohgaki
b52edbddf9 Shouldn't enable implicit_flush like this.
Most problems are fixed. If you find internal function that does
not follow my comment, please fix it or let me know.
2002-10-03 09:57:53 +00:00
Ilia Alshanetsky
01830c0d27 Added missing TSRMLS_DC to php_apache_lookup_uri() 2002-10-03 01:28:04 +00:00
Ilia Alshanetsky
ca0aced7c9 Added apache_response_headers(), apache_note(), apache_getenv() and
apache_setenv() functions.
The getallheaders() is renamed to apache_request_headers() and an
getallheaders() is aliased to it.
Added a better error reporting mechanism to apache_lookup_uri() and virtual().
2002-10-02 21:22:44 +00:00
foobar
350340241c Possible fix for #19290 2002-09-29 22:24:20 +00:00
Sascha Schumann
e6e54605b7 Follow Yasuo's suggestion and build sapi program's under the sapi-specific
directory.

Move sapi-specific makefile fragments to their respective directory.

Create an embed sapi module which resides in its own dir now.
2002-09-29 16:22:49 +00:00
Edin Kadribasic
4be735db9e Those two have enough credits already :) 2002-09-27 12:15:13 +00:00
Colin Viebrock
c7c275b741 fix phpinfo() output for better browser BC 2002-09-26 17:54:54 +00:00
Ilia Alshanetsky
44d42b8e13 Fixed bug #17466 2002-09-23 18:51:34 +00:00
David Reid
8dde690042 Allow this to build on beos with it's bizarre linking. 2002-09-23 17:40:04 +00:00
Sascha Schumann
1f18eaadee Force /nocache/ entities to be delivered completely, even if a
broken proxy ignores our anti-cache headers and sends an IMS request.
2002-09-23 15:41:44 +00:00
Zeev Suraski
d31604997b We leak quite a few things intentionally, if you want to debug it - enable
explicitly please..
2002-09-23 11:35:22 +00:00
Ilia Alshanetsky
8a1556b3a1 Fixed bug #17662 2002-09-23 04:10:25 +00:00
Sascha Schumann
625e7b202b Use generic getnameinfo for address-to-name translation, if available.
This adds support for IPv6 addresses.
2002-09-23 00:49:12 +00:00
Sascha Schumann
c74f96333f Immediately unmap /nocache/ entries, so that the mmc cache does not get
polluted too much.
2002-09-21 17:23:15 +00:00
Ilia Alshanetsky
fd094b5b1e Fixed bug #15038, original patch by: phpman@toowards.com 2002-09-21 15:42:33 +00:00
Zeev Suraski
b23adfb43b Fix double initialization 2002-09-21 01:53:15 +00:00
Colin Viebrock
14a6cc8847 Change phpinfo() to use CSS styling instead of HTML code.
It doesn't render as nicely as it used to on older browsers, but it
does result in smaller files, and opens the door to using your own CSS
to style it differently.

There is a patch to Zend/zend_ini.c, but I don't have enough Karma, so
Derick has the patch.
2002-09-19 21:57:25 +00:00
Zeev Suraski
76312b4508 another startup initialization fix - only ISAPI and CGI SAPI's tested,
minor compile buglets might occur in other SAPIs, but should be trivial
to fix...
2002-09-18 21:57:42 +00:00
foobar
55362251c8 Should fix #19425 2002-09-16 13:13:52 +00:00
Dan Kalowsky
7dd7d39385 Fix for bug #19290
# Untested
2002-09-08 18:13:56 +00:00
foobar
3bf7519210 @- Added --disable-all configure option. (Jani) 2002-09-04 18:47:28 +00:00
Marcus Boerger
0b25d07f15 Fix headers when default content type is used.
#THIS fixes the problems with error_log()
2002-09-04 15:30:56 +00:00
Jan Lehnardt
298ae37e8c - prepare non-html phpinfo output for zend extensions 2002-09-02 20:44:01 +00:00
Christian Stocker
9495fb9d7d @ - Added php.ini option "allow_webdav_methods" to allow handling of
@   WebDAV http requests within PHP scripts. (chregu)
# More methods (for DeltaV) will follow.
2002-08-22 07:48:23 +00:00
foobar
91b3644a72 These functions are not used elsewhere. 2002-08-22 00:19:54 +00:00
foobar
8beb1e2237 Fix ZTS build 2002-08-21 23:51:12 +00:00
Dan Kalowsky
57a1181b9a Fix for Bug #18999 2002-08-20 23:04:53 +00:00
Rasmus Lerdorf
f5630aa246 Fix xbithack bug finally (see bug #16515) 2002-08-19 15:52:21 +00:00
Edin Kadribasic
1fb6a30f0f Debug functions should only work in debug mode. 2002-08-19 13:46:39 +00:00
Holger Zimmermann
b79415334e Some minor changes related to Pi3Web 2.0.1. 2002-08-18 15:46:48 +00:00
Stefan Esser
8d2bc70752 make POST requests work again 2002-08-18 13:05:44 +00:00
Holger Zimmermann
93bbc5e531 Removed unused local variable header_line. 2002-08-18 11:05:28 +00:00
Zeev Suraski
9e743e83a5 Fix a NASTY multithreading bug with in the Apache module 2002-08-15 23:59:47 +00:00
Dan Kalowsky
0917902b92 Fix for Bug #9280 with regards to an Expect header. patch submitted by
Ilia <ilia@prohost.org>
# someone just give the man his php4 karma please!
2002-08-14 17:15:49 +00:00
Dan Kalowsky
398288f236 Fix for Bug #18794, and probably various others with nsapi 2002-08-14 16:39:26 +00:00
Rasmus Lerdorf
cd9bb8e555 Fix proto 2002-08-13 04:03:20 +00:00
Marcus Boerger
8e7acaca47 change order of initialisation to allow making filename available
through $_SERVER variables (Bug #18657)
2002-08-10 22:42:38 +00:00
Dan Kalowsky
9b7cc76300 fix for bug #18794, not checking for actual files 2002-08-08 05:52:15 +00:00
Harald Radi
e84bddf76a dump memory leaks on shutdown 2002-08-07 18:16:44 +00:00
Marko Karppinen
6d80c191bb The link lines don't need any of $DEFS, $INCLUDES, $EXTRA_INCLUDES or
$CPPFLAGS, right? Removed them. Added frameworks to $COMMON_FLAGS.
2002-08-06 17:51:24 +00:00
Marko Karppinen
5611c2fc78 Support compiling and linking against Darwin / Mac OS X frameworks 2002-08-06 16:01:34 +00:00
Sascha Schumann
8fd3f14ab1 Fix segfault due to unchecked null pointer 2002-07-26 16:16:12 +00:00
foobar
272913f3d4 - Fixed bug: #18560, the macro was not defined always. 2002-07-25 18:37:16 +00:00
Holger Zimmermann
2771e6d4f6 Removed some outdated lines from init_request_info(). 2002-07-23 17:12:54 +00:00
Marko Karppinen
b231fc0d35 Made PHP_ADD_LIBPATH use the $ld_runpath_switch and changed the Darwin
link lines in sapi/cli and sapi/cgi to use $NATIVE_RPATHS.
This is a tentative fix for #18450.
2002-07-21 14:42:01 +00:00
Sascha Schumann
1326c95b29 refine 2002-07-16 16:24:15 +00:00
Sascha Schumann
fa3d840cd1 integrate the public keep-alive patch
the patch did not handle pipeling at all, so that some code had to be added
from Premium thttpd

persistent connections are supported, if a script sets the Content-Length
header
2002-07-14 18:01:08 +00:00
Sascha Schumann
b4c28fba7f thttpd blocks in rare circumstances where it cannot write out a small HTTP
response (happened at customer sites).  The response is now written out
using the standard state machine.

the buffer which is handed to thttpd by php is now simply dealt with as if
it were a thttpd generated response (avoids code duplication).
2002-07-14 13:48:46 +00:00
Sascha Schumann
402cc031cd make the sapi module hand off a buffer to thttpd for final data delivery,
instead of blocking the whole process
2002-07-14 13:10:34 +00:00
foobar
6a42e635ca Needed this to be able to test safe-mode stuff on cmd-line 2002-07-13 04:43:12 +00:00
Sascha Schumann
6d643eb035 Break up the INSTALL_IT line into comprehensible pieces
and fix a bug related to [..] quotes.
2002-07-11 14:41:03 +00:00
Sascha Schumann
808f05c205 the variable interpolation was already subject to IFS treatment,
which resulted in the execution of the foremost directory.

we capture the output before setting IFS now
2002-07-11 13:33:22 +00:00
Sascha Schumann
ee619493b3 Use a simple IFS; set step to interprete the httpd -v output 2002-07-11 08:44:42 +00:00
foobar
2ca9ae687d - Fix the version check again. 2002-07-07 15:43:45 +00:00
Marko Karppinen
a6eeec28b6 Moved the cgi link line to sapi/cgi/config.m4 and stopped
using libtool on Darwin on it
2002-07-04 08:39:11 +00:00
Sascha Schumann
2c3801b979 Generate content-type header, if the user did not specify one of its own.
Noticed by: Edin Kadribasic <edink@proventum.net>
2002-07-04 08:13:19 +00:00
Sascha Schumann
b3e562f9ef Add CRLF after complete HTTP reply header 2002-07-03 11:46:37 +00:00
Sascha Schumann
99cfb41da0 Use "Status: %d" instead of "HTTP/1.0 %d X" in the CGI SAPI module
as per the CGI RFC.

The status notation is incompatible with Apache's non-parsed-header mode
"nph-*", but that has never worked before anyway.  One could make the
format string configurable.

Noticed by: Sebastian Bergmann
2002-07-03 11:44:48 +00:00
Sascha Schumann
9c876ea01a Add sapi_header_op interface which supersedes the sapi_add_header and _ex
calls.

Revert the change to the sapi_add_header_ex interface.

Fix various bugs:

1.  header("HTTP/1.0 306 foo");
    header("Location: absolute-uri");

    did not work in combination with several SAPI modules, because
    http_status_line was never properly reset.  And thus, all SAPI
    modules which looked at http_status_line ignored the changed
    http_response_code.

2.  The CGI SAPI did not send out the HTTP status line at all, if
    http_status_line had not been set explicitly by calling
    header("HTTP/1.0 200 foo");
2002-07-03 10:42:31 +00:00
Marko Karppinen
23de5d1c20 - You don't need libtool to build sapi/cli on Darwin.
- We don't need libtool to build sapi/cli on Darwin.
- You want the sapi/cli build line to be in sapi/cli, not Makefile.global.
- We want the sapi/cli build line to be in sapi/cli, not Makefile.global.
- He can go about his business.
- You can go about your business.
- Move along.
- Move along. Move along.
2002-07-01 21:17:39 +00:00
foobar
999d9aa10f Better fix it here too.. 2002-06-29 00:33:02 +00:00
Rasmus Lerdorf
03b76b278e Oops, extra pipe snuck in 2002-06-29 00:12:46 +00:00
Rasmus Lerdorf
02022179c9 Fix for bug #18055 2002-06-28 23:57:15 +00:00
Sebastian Bergmann
836d9c3e9f Mention Apache 2.0.40. 2002-06-28 15:16:28 +00:00
foobar
21debac333 Require 2.0.40 2002-06-28 14:48:37 +00:00
Derick Rethans
2fda2eb4a8 - YAAC: I hope this is the last one! 2002-06-28 14:45:10 +00:00
foobar
f4699170fc Fixed bug: #17491 (honor INSTALL_ROOT) 2002-06-28 09:01:56 +00:00
Sascha Schumann
ee477dbc56 Fix code which makes wrong assumptions about the return value of snprintf.
The AOLserver module did not use the return value, so simply drop it.
2002-06-26 07:54:50 +00:00
Rasmus Lerdorf
890e01bebe @ Add runtime Apache2 thread check to ensure we don't run a non-threaded
@ PHP inside a threaded Apache2 MPM.  (Rasmus)
2002-06-24 16:04:20 +00:00
Rasmus Lerdorf
8a2ab01744 @ Turn off ZTS if Apache2 is using the prefork MPM. (Rasmus) 2002-06-24 14:51:01 +00:00
Sander Roobol
d279a92242 Made php_admin_value work outside <location> and <directory> blocks. 2002-06-22 15:31:44 +00:00
Andi Gutmans
805a1653f0 - Revert WS changes 2002-06-22 13:59:13 +00:00
Andi Gutmans
85983fe957 - This shouldn't have snuck in. 2002-06-22 13:58:32 +00:00
Andi Gutmans
4216379152 - Stop using persist_alloc(). 2002-06-22 13:53:44 +00:00
Stefan Esser
44a5b43b79 Fixing the same possible memory leak. 2002-06-21 14:47:59 +00:00
Derick Rethans
6869cb3f5a - Added a new parameter to the header() function which overrides the HTTP
response code.
@- Added a new parameter to the header() function which overrides the HTTP
@  response code. (Derick)
2002-06-21 09:31:21 +00:00
foobar
f9e492d00b @- Fixed bug with Apache which let PHP_AUTH_* variables to be set when
@  external basic auth mechanism was used. (Jani)

Fixes bugs: #16653, #14534, #14370
2002-06-13 22:13:57 +00:00
Edin Kadribasic
11bc56d48b Fix exit code (bug #17733). 2002-06-13 08:38:26 +00:00