clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-04 16:26:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,556 Commits 494 Branches 1,367 Tags 818 MiB
c8c0e97982
Commit Graph

1502 Commits

Author SHA1 Message Date
Ilia Alshanetsky
8a9e09a44a ARG_COUNT(ht) -> ZEND_NUM_ARGS(). 2003-01-21 14:56:40 +00:00
Sascha Schumann
294e776d95 add sapi_get_target_uid/_gid for obtaining information about the 
non-privileged user the web server is running as.  this is useful
for creating shared memory segments which need to be accessed by
the child processes/threads.
 2003-01-21 11:03:58 +00:00
foobar
961c9856ef Fixed bug: #21698, httpd.conf not modified with "make install" 2003-01-21 06:02:19 +00:00
Edin Kadribasic
ceb597ea1a Added missing warning about experimental nature of sapi/embed. 2003-01-21 02:46:07 +00:00
Ilia Alshanetsky
c794f2c710 Removed pointless memory allocation checks. 2003-01-18 20:27:05 +00:00
Sascha Schumann
ebedf060a5 Fix POST handling once and for all. The daemon now never blocks and handles 
uploads of up to 2GB on 32 bit platforms.

Uploads >16KB are put into a file-backed mmap area.

SG(request_info).content_type got corrupted somewhere. As a workaround,
we provide SAPI with a duplicate of the original string.
 2003-01-17 18:53:22 +00:00
Edin Kadribasic
60cac99a71 Adjust paths for the new location of ext/rpc/java 2003-01-13 16:07:45 +00:00
Sebastian Bergmann
17c1518792 Patch by Giuseppe Tanzilli <g.tanzilli@gruppocsf.com>. 2003-01-12 08:03:18 +00:00
Sebastian Bergmann
a142ce729f Patch by Giuseppe Tanzilli <g.tanzilli@gruppocsf.com>. 2003-01-12 08:01:42 +00:00
Moriyoshi Koizumi
dd9b7f25cf This patch is likely to fix win32 build 2003-01-11 22:36:38 +00:00
Ilia Alshanetsky
973937e7aa Fix the line numbering when the 1st line in the script is #!. 2003-01-11 00:20:50 +00:00
Ilia Alshanetsky
5de9962d50 Fixed bug #21297. The fix also fixes miscalculation of lines numbers by 1 
due the previously mentioned bug.
 2003-01-08 00:41:53 +00:00
Zeev Suraski
6591b9c826 Add missing call 2003-01-07 16:33:28 +00:00
Zeev Suraski
19d47d9f6e Initialize lineno using the new infrastructure 2003-01-05 16:10:35 +00:00
Zeev Suraski
a2b58500b4 Make the .dsp use the php4build build directories 2003-01-05 15:09:11 +00:00
Derick Rethans
c175f3545c - Fix docrefs 2003-01-03 21:33:31 +00:00
Derick Rethans
0127c07e45 - Fix typo (patch by Joseph Tate) 2003-01-03 21:30:49 +00:00
Anantha Kesari H Y
c1498d7a15 Modifications for NetWare. 2003-01-03 15:59:02 +00:00
Anantha Kesari H Y
38a319e3c6 New file added for NetWare. 2003-01-03 15:39:43 +00:00
Zeev Suraski
895b5fc2b6 Fix .dsp 2003-01-02 14:19:29 +00:00
Sebastian Bergmann
2c5d4b8c23 Bump year. 2002-12-31 15:59:15 +00:00
Ilia Alshanetsky
87e598e835 Changed ifdef to if. 2002-12-31 00:10:57 +00:00
Ilia Alshanetsky
6f6bc82de7 Fixed bug #21045 (Apache 2 SAPI now supports the mod_php_memory_usage 
log variable that allows users to log the memory usage of their PHP scripts).
 2002-12-30 23:45:18 +00:00
Ilia Alshanetsky
8315a525ca Fixed bug #21229 (missing 3rd argument to php_module_startup). 2002-12-28 06:59:24 +00:00
Ilia Alshanetsky
097055a862 Make the version code get the version from the current Apache, rather then 
the Apache PHP was compiled against.
 2002-12-27 23:05:15 +00:00
Ilia Alshanetsky
648dd88b42 Added apache_get_version() & apache_get_modules() to Apache 1.X & Apache 
Hooks sapis.
Made the module listing in Apache 2 not show the '.c' portion, to be
consistent with Apache 1.X.
 2002-12-27 22:47:06 +00:00
Ilia Alshanetsky
572394db74 Added MINFO() to Apache 2, which displays the Apache version & all of the 
loaded Apache modules.
Added apache_get_version() & apache_get_modules() functions.
 2002-12-27 22:02:17 +00:00
Ilia Alshanetsky
967d64ade5 Fixed bug #17098 (make Apache aware that PHP scripts represent dynamic data 
and should not be cached). Fix suggested by daniel.eckl@gmx.de.
 2002-12-27 19:59:09 +00:00
George Schlossnagle
190867c800 fixed ws 2002-12-25 21:18:37 +00:00
George Schlossnagle
abbf745211 fix for 21177 2002-12-25 20:38:37 +00:00
Stefan Esser
66ebbb5ae1 fix compile warning 2002-12-24 23:46:17 +00:00
Moriyoshi Koizumi
9dc6f0c5f2 Made auth information inaccessible under safe mode as discussed in the list 2002-12-21 21:50:28 +00:00
Andrei Zmievski
2feb1cf6d7 MFB. 2002-12-21 20:12:08 +00:00
Moriyoshi Koizumi
4456b3274f WS 2002-12-21 06:34:31 +00:00
Moriyoshi Koizumi
f4883b916c Added some notes about the brigade bug detection 2002-12-21 06:33:19 +00:00
Moriyoshi Koizumi
740ee5df1c Recommited the patch 2002-12-20 15:51:35 +00:00
Edin Kadribasic
3c94150191 MFB: Make sure cli install dir is created before trying to install in it. 2002-12-20 10:12:15 +00:00
Edin Kadribasic
d29309eb68 MFB: 
Making build system changes according to proposal:
http://news.php.net/article.php?group=php.dev&article=92682
 2002-12-19 17:02:40 +00:00
Edin Kadribasic
ff54f76f71 MFB: Reverted previous patches as suggested by Andi. 2002-12-19 00:13:43 +00:00
Moriyoshi Koizumi
978340cfa5 An intuitive attempt to hunt the bug. 2002-12-18 19:32:44 +00:00
Edin Kadribasic
f84aff8f5c Fix for #20539 (patch by Moriyoshi Koizumi). 2002-12-11 10:24:02 +00:00
foobar
8635af07d5 Fixed bug #20298: LDFLAGS were not passed to the static apache module build 2002-12-11 08:41:45 +00:00
Ilia Alshanetsky
dc391673d0 Fixed compiler warning. 2002-12-11 02:51:06 +00:00
Ilia Alshanetsky
60a5aeef43 Fixed a few compile warnings and one compile error. 2002-12-10 20:16:30 +00:00
Ilia Alshanetsky
04a16f914c Replaced deprecated APR_BRIGADE_FOREACH macro. 2002-12-09 18:45:32 +00:00
Melvyn Sopacua
2421e79b60 Fix make install target on Cygwin, bug #20807 2002-12-09 17:02:38 +00:00
Sebastian Bergmann
ba5764ab39 Fix build. 2002-12-09 11:45:46 +00:00
Harald Radi
0c4dc0afdf update todo 2002-12-08 19:05:43 +00:00
Harald Radi
3be2fdd14a initial checkin 2002-12-08 19:05:02 +00:00
Moriyoshi Koizumi
93ee146d0e Fixed stream leaks 2002-12-08 10:23:50 +00:00
Sebastian Bergmann
b3d0cca0e6 A bit of an update for the sapi/servlet installation guide. 2002-12-06 06:44:29 +00:00
Sebastian Bergmann
27ff466cbc Deprecate sapi/fastcgi. 2002-12-06 06:08:17 +00:00
Marcus Boerger
ae35c4731f php_error -> php_error_docref 2002-12-05 23:18:28 +00:00
Harald Radi
8529f3ba95 damn milter api: 
"Furthermore, since there is not a one-to-one correspondence between
 threads and connections (N connections mapped onto M threads,
 M <= N), connection-specific data must be accessed through the handles
 provided by the Milter library."

which in other words means php_request_startup() and the corresponding
php_request_shutdown() will never be called for the same thread
 2002-12-03 16:26:57 +00:00
Harald Radi
bf16a54f5a fix typos and make example more useful 2002-12-03 14:43:43 +00:00
Shane Caraveo
76e09401ab aparently did not add these on head 
removed ssize_t which was causing problems, and not in libfcgi anyway
 2002-12-02 05:24:54 +00:00
Shane Caraveo
75cbbfacb1 fix use of Alias under apache by defaulting script_name to redirect_url 
dont lstat, stat.
 2002-12-02 02:16:38 +00:00
Jon Parise
6be496f44e Correct the punctuation of these error messages. 2002-12-02 00:21:15 +00:00
Shane Caraveo
9bc3f72d8e build support for cgi fixes previously commited 2002-12-01 21:50:35 +00:00
Shane Caraveo
a3bd39429c Fix CGI to match cgi spec. 
This patch properly fixes support for CGI in PHP.  For backwards compatible
broken behaviour, cgi.fix_pathinfo can be set to zero in php.ini.
CGI failed to work under apache at all, either using the cgi-script directive
or as a ScriptAlias setup. Typicaly it would try to parse itself.  This will
still happen if you dissable fix_pathinfo, and set DISCARD_PATH.
This also fixes PATH_INFO, and finally we can run pres2 under cgi or fastcgi.
This patch has been tested under Apache 1.3, 2.0, IIS, as both cgi and fastcgi,
on Windows and OSX.  A followup patch with build stuff for linux will follow.
 2002-12-01 21:37:14 +00:00
Harald Radi
3fb36b0c56 example 2002-12-01 20:29:14 +00:00
Harald Radi
e25b194525 rename callbacks to fit the original name 2002-12-01 20:28:54 +00:00
Harald Radi
b460dfc042 initial checkin 2002-12-01 19:55:48 +00:00
Harald Radi
9d5e55f790 if the api functions are called, check if they're valid in that context 
reopen file per request, so milter doesn't hang. PHPA or APC can be used to speed the milter up
added a milter_init callback to init the milter before it is registered
added protos to make sniper happy
 2002-12-01 19:50:07 +00:00
Harald Radi
8c19b754f9 first working version 2002-12-01 16:37:59 +00:00
Harald Radi
db93856c07 check for libmilter path 2002-12-01 13:44:22 +00:00
Harald Radi
e4bc32fbe2 no message 2002-12-01 13:36:53 +00:00
Stanislav Malyshev
2c7d6f9a74 improve username/password detection for IIS 2002-12-01 12:48:08 +00:00
Harald Radi
1356e60fa3 no message 2002-12-01 12:23:47 +00:00
foobar
e178bdc1ee Fix build 2002-12-01 05:14:56 +00:00
Harald Radi
0244ca1d97 it finally compiles now 
tests will follow tomorrow
 2002-12-01 03:37:49 +00:00
Sascha Schumann
2b95b3c83b add a "force HTTP/1.0 response" facility to the SAPI layer 
this is necessary, when you want to take over control of a connection
and the web server is doing stupid things by default (like enabling
chunked transfer encoding for no reason).
 2002-12-01 03:28:21 +00:00
Harald Radi
b7b5ca519f fix build 2002-12-01 02:45:30 +00:00
Harald Radi
39e03b580b todo or not todo 2002-12-01 01:36:26 +00:00
Harald Radi
3a0a2411c7 added remaining functions, still untested, still having problems with config.m4 2002-12-01 01:18:48 +00:00
Harald Radi
ad6333654e Sendmail Milter SAPI 
initial version
 2002-12-01 00:21:10 +00:00
Sascha Schumann
95fead0b9f add missing line 2002-11-29 11:34:08 +00:00
foobar
dd53efc196 - Made the STANDARD_SAPI_MODULE_PROPERTIES be what it says it is. 2002-11-26 05:57:06 +00:00
Shane Caraveo
95b4045f48 configure now supports building the cgi-fcgi module 
configure --enable-fastcgi
 2002-11-26 05:51:16 +00:00
Sascha Schumann
09f463ddae Add sapi_get_fd() and implement it for the Apache/thttpd SAPIs. 2002-11-26 05:15:55 +00:00
Edin Kadribasic
81711ba621 Avoid possible buffer overflow. 2002-11-22 15:47:39 +00:00
Edin Kadribasic
fd47c5bb32 MFB: Don't send default http status (200). 2002-11-22 13:55:27 +00:00
Edin Kadribasic
714a5be6cc Fixed bug #19207 by adding cgi.rfc2616_headers configuration directive. 2002-11-22 10:15:47 +00:00
George Schlossnagle
010fd97aa5 brief v1 documentation 2002-11-19 19:03:20 +00:00
George Schlossnagle
3bdfbd6d1e Props to Lukas as well 2002-11-19 18:57:38 +00:00
foobar
dad428b49e Add George to the credits and add note about it being different than the real Apache SAPI 2002-11-19 18:02:36 +00:00
foobar
5df80a262b Fix the configure.. 2002-11-19 17:58:10 +00:00
George Schlossnagle
c598b3ac16 now this works (thanks Rasmus) 
Note:  the correct line is --with-apache-hooks
 2002-11-19 01:20:42 +00:00
George Schlossnagle
0ad980c667 fixed recurrent entrance to add_cgi_vars 2002-11-18 19:07:37 +00:00
Edin Kadribasic
03fc9eb415 Initial attempt to get apache_hooks api to compile on windows. 
Still getting link errors with
undefined symbol: 'php_request_startup_for_hook'.
 2002-11-18 12:52:57 +00:00
Edin Kadribasic
f8026b7453 Updated windows build file. 2002-11-18 12:30:08 +00:00
Rasmus Lerdorf
a94a226691 Fix a few warnings - compiles nicely now 2002-11-18 06:14:10 +00:00
George Schlossnagle
2c34ea1be4 #defined offsetof, for systems that can't find it 2002-11-18 06:09:23 +00:00
George Schlossnagle
824fdad6c1 initial import of all these files. This was previously the apache_hooks 
branch of the apache sapi.  Now it lives on its own.  General functionality
seems to be working, though there may be a problem with some
output buffering, most likely due to the way that sapi_deactivate needs
to be mangled with here.
 2002-11-18 01:01:21 +00:00
Andrei Zmievski
ca332dfc96 Oops. 2002-11-15 00:32:42 +00:00
Andrei Zmievski
3e8a800a96 Fix function prototype. 2002-11-15 00:31:10 +00:00
Andrei Zmievski
e09d62c435 Sort the modules and extensions before printing them when -m switch is used. 2002-11-14 20:32:28 +00:00
Sascha Schumann
46a99e9022 - Remove PHP_DISABLE_CLI 
- Streamline ircg build: thttpd-dependent part moved into separate source
  file, so that it can be added to the SAPI-only object list.
 2002-11-14 01:09:46 +00:00
Jan Lehnardt
e95c7178cc - be more verbose 2002-11-13 12:41:05 +00:00
Marcus Boerger
cecb9dfc79 Implemented -n switch to skip parsing ini at startup as suggested by Wez. 
#The switch 'n' was planned to be used for beautifying....delete n to make
#clear these functions do not have a switch yet.
 2002-11-12 20:56:47 +00:00
Hartmut Holzgraefe
cb6202bbe8 reverting accidential commit 2002-11-12 16:41:14 +00:00
Hartmut Holzgraefe
0c395d0f4c *** empty log message *** 2002-11-12 16:37:47 +00:00
Ilia Alshanetsky
b09c1afe0e PHP flags specified in .htaccess can now be turned on by using '1' as well as 
'On'.
 2002-11-10 19:34:09 +00:00
Sascha Schumann
a8136b4dba Defend against pipelined requests on persistent connections as used by 
IRCG. These could cause thttpd to start a second request in the same
connection context, and thereby causing real damage.

Mozilla 1.0.1 is buggy in that context: When HTTP/1.1 pipelining is
enabled (defaults to off), it will send any number of requests over
a persistent connection (which is fine), even after it has received
a "Connection: close" header field in a subsequent response header.
This blatantly violates RFC 2616, section 8.1.2. Because it cannot
receive any response on the dead connection, the download manager
pops up and tries to download a file (which never arrives).

Also, we don't try to send a 400 message anymore, if the connection
dies.
 2002-11-10 15:21:13 +00:00
Sascha Schumann
f2f443f066 s/PHP_API/PHP_API_VERSION/ 2002-11-08 13:29:32 +00:00
Sascha Schumann
8d25447f30 let this source file compile with php 4.2.x 2002-11-07 11:56:02 +00:00
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
Edin Kadribasic
acae873a6b Disable installing pear when --disable-cli is used since pear installer 
needs cli to function.
 2002-06-11 09:35:59 +00:00
Sascha Schumann
5e148e3875 too many flushes are bad 2002-06-08 18:11:03 +00:00
Sascha Schumann
190b65f4a1 Fix build 2002-06-01 17:38:23 +00:00
Andi Gutmans
0d5862d75a - Reapply netware patch 2002-06-01 10:27:51 +00:00
Rasmus Lerdorf
f01a42b499 Put Netware header and comment back in. My CVS revision id got messed 
up somehow.
 2002-06-01 09:54:28 +00:00
Rasmus Lerdorf
b66f48c3ce Oops 2002-05-31 23:52:07 +00:00
Rasmus Lerdorf
6b756ea46c @ Renamed getallheaders() to apache_request_headers() and kept 
@ getallheaders() as an alias to it.  Also added apache_response_headers()
@ which returns the current response headers from Apache.
Renamed getallheaders() to apache_request_headers() and kept
getallheaders() as an alias to it.  Also added apache_response_headers()
which returns the current response headers from Apache.
 2002-05-31 23:49:49 +00:00
Venkat Raghavan S
ecdbaeced1 Removed ugly code done as part of NetWare change, upon Andi's advice. Now, the typecasting is done for all platforms. 2002-05-31 09:07:12 +00:00
Venkat Raghavan S
575e3682f5 NetWare related changes 2002-05-31 04:49:45 +00:00
Cliff Woolley
46eeabccf7 That macro is and always was hopelessly broken, which is why it's 
now deprecated.
 2002-05-30 06:07:28 +00:00
Edin Kadribasic
2d953b348a Merge from cli. 2002-05-26 13:12:30 +00:00
Edin Kadribasic
af5663fa50 Due to the way Zend handles exit() we cannot rely on the return code 
of php_execute_script.
 2002-05-26 12:43:20 +00:00
Edin Kadribasic
190719ab97 Made constants persistent and fixed a memory leak. 2002-05-26 12:20:35 +00:00
Edin Kadribasic
1501657b2f Register STDIN, STDOUT, and STDERR "constants" in cli in cases where 
script itself is not being loaded from STDIN.

This enables constructs like fwrite(STDERR, "Error 42");
 2002-05-24 01:17:37 +00:00
Wez Furlong
64df5577bf Add README and CREDITS... 2002-05-22 00:03:02 +00:00
Wez Furlong
139fd6a8e4 Fix bug when length was queried before the string was converted. 2002-05-22 00:02:35 +00:00
Wez Furlong
3fca69809d Use the GIT for inter-thread marshalling. 2002-05-20 22:22:57 +00:00
Harald Radi
02a13a4ec4 this way it even compiles 
#blame me if i did something wrong, i didn't test it ;)
 2002-05-20 15:38:19 +00:00
Wez Furlong
e754361405 Implement ActiveScript interfaces. 
This allows use of PHP in:
  Client-side script in Internet Explorer
  Windows Scripting Host
  ASP and ASP.NET pages
It's mostly working... give it a go.
You will need to regsvr32 the php4activescript.dll manually.
 2002-05-20 01:35:29 +00:00
Sascha Schumann
d7edeee55f Improve readability of the header send function 2002-05-17 21:22:30 +00:00
Cliff Woolley
8283979afc Allow the version checks for --with-apxs= and --with-apxs2= to work 
with development version of Apache, whose version strings end in "-dev",
eg "Apache/2.0.37-dev".

PR: 17233
Submitted by: Dale Ghent <daleg@elemental.org>
 2002-05-17 08:07:14 +00:00
Cliff Woolley
57a4a7ed39 apache 2.0's apache_lookup_uri() was returning an array rather than an 
object, which contradicted both the documentation and the behavior of the
same function under apache 1.3.

PR: 14999
 2002-05-17 06:32:04 +00:00
Cliff Woolley
78cac2a42e * restore the php_flag and php_admin_flag Apache directives which for 
some mysterious reason never made their way from sapi/apache to
  sapi/apache2filter when it was first written  PR: 16629
* change the allowed locations of php_admin_value (and php_admin_flag to
  match) to ACCESS_CONF instead of OR_NONE to match sapi/apache.  No
  idea why it was ever OR_NONE.  PR: 16489
 2002-05-17 05:16:18 +00:00
Jason Greene
e2c80df0dd Fix fastcgi build, may need more work 
# Sascha, would you mind looking this over?
 2002-05-14 00:07:51 +00:00
Marko Karppinen
5a5767e1d6 Patch by Justin Erenkrantz <jerenkrantz@apache.org> for enabling 
--with-apxs2 build on Darwin. Omitting the change to start linking
with libtool for now, though.
 2002-05-13 21:37:52 +00:00
Jim Jagielski
8006ee79a3 More verbose but more generic error message when we spot multiple 
PHPINIDir directives
 2002-05-13 19:22:27 +00:00
Markus Fischer
965b4c26f1 - Update about CLI default settings and it's weirdness. 2002-05-11 20:33:59 +00:00
Edin Kadribasic
8e15de012a Added copyright notice to php -v output. 2002-05-11 14:26:30 +00:00
Sebastian Bergmann
5192f6432c Patch by Justin Erenkrantz <jerenkrantz@apache.org>. This should be MFHed. 2002-05-11 08:58:20 +00:00
Zeev Suraski
5af649efbd Revert to the old php_ini.c, and reimplement the binary-path searching. 
Should now also work under UNIX (CLI/CGI)
 2002-05-11 03:41:17 +00:00
Zeev Suraski
ce20564d1e whitespace 2002-05-11 03:33:29 +00:00
Zeev Suraski
2d0f07d086 Add missing element 2002-05-11 02:58:43 +00:00
Markus Fischer
ccbadfc111 - Prefix the first version line with 'PHP' so it's easier to use shell tools to 
parse the version number (both CLI and CGI).
 2002-05-10 16:18:00 +00:00
Markus Fischer
bf351e9639 - This affects both CGI and CLI sapi: 
Remove Zend version output from -m switch and move it over to the output of
  the -v switch (-v is supposed to list version numbers, not -m).
 2002-05-10 16:04:03 +00:00
Preston L. Bannister
57c5998ff9 Backed out preceding change. 2002-05-09 23:33:27 +00:00
Preston L. Bannister
d706e224ac Detect when running under IIS and default force_redirect to zero. This This means an explicit php.ini setting is no longer required. 
(No extraneous whitespace changes this time :).
 2002-05-09 21:03:30 +00:00
foobar
42c82bb40d Revert the last patches. 2002-05-09 20:03:36 +00:00
Preston L. Bannister
06f375b1cf Detect when running under IIS and not require explicit setting of force_redirect. 
This means an explicit php.ini setting is no longer required.
 2002-05-09 19:32:39 +00:00
Sander Roobol
7586cdc654 Added the current SAPI to the output of php -v 2002-05-09 09:36:45 +00:00
Rui Hirokawa
f30b722f14 Added conversion support from script character encoding to internal character encoding. This feature is very useful for japanese who uses Shift_JIS encoding because some of characters in Shift_JIS are including '0x5c' and it causes some troubles on Zend parser. This patch is made by Masaki Fujimoto. 2002-05-08 12:33:44 +00:00
Derick Rethans
dedf22f5ad - Added Aaron Bannert as maintainer 2002-05-08 05:17:59 +00:00
Edin Kadribasic
d00252cf38 Update README with register_argc_argv settings override. 2002-05-06 15:49:06 +00:00
Aaron Bannert
8e176a10fc Fix a graceful restart SEGV. We no longer only perform initialization 
on the second pass through the post_config. Now we only avoid the
initialization only on the first DSO load, and on all subsequent loads
we rerun the init code.
 2002-05-05 18:15:33 +00:00
Aaron Bannert
b759322411 Fix an elusive and intermittent startup SEGV. The problem was 
the static string we were using to set an initialization flag
would get remapped to a different location when Apache reloaded
the DSO, causing us to not run our initialization routines.

Submitted by: Justin Erenkrantz <jerenkrantz@apache.org>
Reviewed by: Aaron Bannert (I added the big comment too)
 2002-05-05 18:11:41 +00:00
foobar
5f13f4ecb7 Force register_argc_argv=On for CLI 2002-05-05 17:11:04 +00:00
Marko Karppinen
b7e50782b7 Well that didn't last long! (Reverting previous.) 2002-05-05 09:52:39 +00:00
Marko Karppinen
32ff990c68 Prelim. patch to enable apache2filter to link on Darwin. 
Submitted by: Justin Erenkrantz <jerenkrantz@apache.org>
Reviewed by: markonen
# A stopgap measure while we try to find a "real"
# solution, if one exists.
 2002-05-05 09:40:31 +00:00
Sascha Schumann
1ed3f698fe ap_php_optopt is set but never used 2002-05-04 17:27:18 +00:00
Sander Roobol
7a64b2b7e5 Fixed some minor typos 2002-05-02 17:19:42 +00:00
Sebastian Bergmann
edba077000 Fix build. 2002-05-02 15:18:26 +00:00
James Cox
ba85302e79 updated cgi warning notice. 2002-05-02 14:55:12 +00:00
foobar
2c8e8e0406 Fix build when openssl is enabled. 2002-04-28 04:53:40 +00:00
Sascha Schumann
12ba44827a be a bit more verbose about what is wrong 2002-04-26 21:26:47 +00:00
Sascha Schumann
e2ad07fdcf Fix external builds 2002-04-26 10:23:16 +00:00
foobar
492efe963f - Fix for bug: #16791. (more reliable test) 2002-04-26 03:07:16 +00:00
Aaron Bannert
b2f9b6fb16 Apache does a full load, unload, load cycle for each DSO module. 
This patch makes sure that any startup actions that are performed
for PHP don't happen until the second load (the second call to
the post_config hook), and it also prevents subsequent calls
to the initialization routines.

Suggested By:   Cliff Woolley

PR: 16475, 16754
 2002-04-24 00:55:38 +00:00
Hartmut Holzgraefe
4852dd3569 apache_child_terminate() returns status as bool 
proto fixes
 2002-04-23 11:40:19 +00:00
foobar
f54f199906 This was not supposed to be uncommented..yet. 2002-04-23 03:02:20 +00:00
foobar
dace2eca03 Part 4 of apache sapi build fixes: 
- Fixed many conflicts caused by bogus includes, e.g the infamous XtOffset
  redefinition warning is gone now.
 2002-04-23 03:01:30 +00:00
foobar
eb18c5c38c Part 3 of static apache build fixes: 
- Use the PHP_CFLAGS when compiling the php4 module in apache tree.
- Use the apache include dir only when compiling sapi/apache
  o Fixes the fnmatch.h issue Wez complained about :)
 2002-04-23 02:58:54 +00:00
Jim Jagielski
a6117a874e Typo in error string 2002-04-22 20:00:41 +00:00
Marko Karppinen
42555b189e Refine the OS X support a bit 2002-04-22 15:37:54 +00:00
Marko Karppinen
2cd85ac084 Merged the Mac OS X compile changes from the Apache 1.3 SAPI. 
--with-apxs2 should now work on Mac OS X / Darwin.
# Not tested, though. So shoot me! :)
 2002-04-22 15:25:17 +00:00
Edin Kadribasic
6c491a5654 Reverting my previous patch. 2002-04-22 12:00:53 +00:00
Edin Kadribasic
8509772d93 Added ..\..\..\php_build\lib\apache2 to libpath and 
..\..\..\php_build\include\apache2 to includepath
 2002-04-21 20:36:08 +00:00
Derick Rethans
68ca74c371 - Gaurd for problems in fault servers (fixes problem with Sambar 5.2) 2002-04-18 22:51:23 +00:00
Aaron Bannert
5ab179e830 Document the new PHPINIDir directive in the apache2filter/README. 2002-04-18 22:47:13 +00:00
Aaron Bannert
3aa8a9b62b This patch implements a new Apache2 directive called PHPINIDir that 
allows the specification of the php.ini directory from within the Apache
configuration. If left unset, the default is to defer to the hard-coded
php paths. When set, the supplied path is made relative to Apache's
internal ServerRoot setting.

Example:
PHPINIDir "conf"
# PHP will now look in the ServerRoot/conf directory for the php.ini file
 2002-04-18 22:10:57 +00:00
Aaron Bannert
d11ee7c1ea Fix an intermittent SEGV when an error bubbled up from PHP before our 
server context was set. Now if that happens we simply don't log against
any particular server config (vhost).

Obtained from bug report by:  Balazs Nagy <js@iksz.hu>
 2002-04-18 16:34:06 +00:00
Aaron Bannert
2e3ce44c80 It makes more sense to do the null-pointer check *before* trying to use it. 
(Also fix a typo that Cliff pointed out: "safe" --> "save".)

Obtained from:  Ryan Morgan <rmorgan@covalent.net>
 2002-04-16 17:41:28 +00:00
foobar
b21931e6c3 ws fixes 2002-04-14 12:38:33 +00:00
foobar
7c2811e1ab Make it possible to actually disable the CLI.. 2002-04-14 03:57:59 +00:00
foobar
0fa1516483 - Prevent users from trying to make a static build with Apache2 using 
--with-apache

# I have working --with-apache2 stuff also..need to test it a bit more
# before committing it..
 2002-04-13 05:58:29 +00:00
foobar
f81166f34e - Added checks to prevent building the DSO with wrong configure option. 2002-04-12 22:59:07 +00:00
Aaron Bannert
bf8bb929ac Fix a typo and a build error detected by the lovely HPUX11 ANSI C compiler. 2002-04-12 22:25:29 +00:00
Yasuo Ohgaki
439b56842f CGI/CLI take file and dir for -c option by this. 
@ Both 'file' and 'path to php.ini' is allowed for "-c" cli/cgi option. (Yasuo)
 2002-04-12 00:20:29 +00:00
Aaron Bannert
22fb507325 Fix a problem where php-generated data was pushed down the entire output 
filter chain instead of just down the rest of the chain. This fix will
speed up some unnecessary overhead introduced in the last patch.

Suggested by:  Cliff Woolley <jwoolley@apache.org>
 2002-04-11 20:34:56 +00:00
Aaron Bannert
27a5b380cf PHP filters and Apache 2 aren't quite a perfect match yet, so we have 
to do some trickery with the server_context to make sure it is always
valid within the current thread.

This patch makes sure the server_context is created in apache's
post_read_request hook phase, and then registeres a cleanup that
will NULL out the server context when the request goes out of scope.
Then, inside the output filters, if the server_context is null we
throw an error. Finally, instead of saving the output filter in
the server_context, now we store the entire request_rec pointer
in there.

POST bodies appear to be working now, although they are very inefficient.
The input filter is still just realloc()ing for whatever data comes
down the input pipe, and then sending this to PHP. This means that
we are doing some really nasty memory management on big POST bodies.
For now this it allows for unlimited input bodies, which means that
a big POST could potentially DoS a box by making it run out of memory.
We might want to put a limit on here just in case, at least until
we figure out how to consume input data more efficiently into php.
 2002-04-11 19:25:08 +00:00
Aaron Bannert
caf7f3d4d2 Don't depend on the context provided by the filter (f->ctx) anymore. In 
Apache 2 the input and output filter contexts are kept unique. We now
only depend on SG(server_context) for each request, and assume that
the same thread will process the entire request. At some point it
would be wise to separate the input and output contexts.
 2002-04-11 17:34:17 +00:00
Aaron Bannert
d19fd6a0ad Return the number of bytes consumed, not the number of bytes left. 
Suggested by:  Brian Havard <brianh@kheldar.apana.org.au>
 2002-04-11 17:22:11 +00:00
Sebastian Bergmann
bdc27671cd Update README. 2002-04-11 17:01:51 +00:00
Sebastian Bergmann
38af983c80 Patch by Aaron Bannert <aaron@clove.org> and Cliff Woolley <jwoolley@virginia.edu>. 2002-04-11 06:01:54 +00:00
foobar
6958369295 Let people know this stuff is experimental. 2002-04-10 09:42:38 +00:00
Sterling Hughes
53fdf83f09 eekk -- and ssb thought my macro's were icky :) 2002-04-09 17:25:13 +00:00
Sterling Hughes
11acdb097d fix compile warnings 2002-04-09 06:13:00 +00:00
Sebastian Bergmann
777bc9f954 Fix output directory. 2002-04-06 15:45:00 +00:00
Sebastian Bergmann
b0eb69ecc0 Fix output directory. 2002-04-06 15:37:08 +00:00
Sebastian Bergmann
db840b8001 Fix Debug_TS build. 2002-04-06 08:57:06 +00:00
Wez Furlong
abc5a2cacb fix quoting 2002-04-02 16:45:10 +00:00
James Cox
99a68d4f83 just did... 2002-04-02 01:35:45 +00:00
James Cox
f3d107a180 updated the alert sent to the browser. removed the verbosity, and linked to more info. 2002-04-02 01:34:15 +00:00
Marko Karppinen
676afb33b8 Enable --with-apxs build on Mac OS X. We build an MH_BUNDLE instead of 
an MH_DYLIB. As all PPC code is relocatable, we don't use the libtool
based shared build but go a static route. Goodbye libtool!
# I'm committing this to enable widespear testing.
# Anyone have any ideas on how to easily backport this to 4.2.0?
 2002-03-30 03:17:25 +00:00
Marko Karppinen
60663c1f64 Prepare for MH_BUNDLE build on Mac OS X / Darwin 2002-03-29 19:25:55 +00:00
Doug MacEachern
eab1211ed1 adjust to recent apr bucket api changes 2002-03-29 15:42:18 +00:00