clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-05 08:46:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,541 Commits 494 Branches 1,367 Tags 820 MiB
7299119f13
Commit Graph

1446 Commits

Author SHA1 Message Date
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
foobar
49ba2a983b WS fix 2002-03-27 22:49:21 +00:00
Marcus Boerger
406c665c13 recorrect las checkin 2002-03-27 21:01:26 +00:00
Marcus Boerger
f277bf0c5c allow other modes to work with -- correct 
#original idea was to allow this *only* for PHP_MODE_STANDARD
 2002-03-26 14:43:57 +00:00
Marcus Boerger
a2631c1f1d fix behaviour on -- 
#now php -- -i for scriptfile -i works
 2002-03-26 11:22:20 +00:00
Alex Waugh
0f3b304506 Backslashes caused the build to fail with autoconf 2.52 2002-03-24 22:57:00 +00:00
Edin Kadribasic
62df9cf644 Override max_execution_time, setting it to unlimited. 2002-03-24 17:14:34 +00:00
Edin Kadribasic
9ecec88998 Documented -r and added TODO 2002-03-23 23:47:10 +00:00
Marcus Boerger
fdf9d3502a -removed -x 
-error handling for illegal switch combinations
-corrected ws for one case block
 2002-03-23 17:10:31 +00:00
Sebastian Bergmann
bfa05df3fd Nuke unused variables. 2002-03-23 13:13:15 +00:00
Marcus Boerger
122c18741c @Added new switch -x to CLI that enables execution of files without @scripting tags. (Marcus) 
-Add -x
#Read follow up mail
 2002-03-22 15:26:27 +00:00
Zeev Suraski
dcb44bf512 - Fix whitespace (guys, please try to stick with the php4 tree style as far 
as indentation/newlines go, and also as far as using {} even on if's
  that have single statements)
- Fix Windows build
 2002-03-19 19:15:40 +00:00
Shane Caraveo
c806dca62c add security impersonation feature for running under IIS security 2002-03-18 04:48:34 +00:00
Shane Caraveo
b84c61f314 Add impersonation feature for running under IIS 2002-03-18 04:46:32 +00:00
Shane Caraveo
4a8dda7d01 fix closing pipes 
fix buffer overrun
 2002-03-17 08:21:18 +00:00
Sebastian Bergmann
2ff115b01e Add note on which version of Apache 2 this SAPI module is compatible with. 2002-03-14 06:31:37 +00:00
Sebastian Bergmann
118761e11e Sync with Apache2 Filter API change. 2002-03-13 07:11:00 +00:00
Marcus Boerger
343b413cf8 -passing arguments to CLI, see: php -h 2002-03-11 16:25:32 +00:00
Ben Mansell
889988763f Instructions for using FastCGI-PHP with Apache 2002-03-11 14:34:56 +00:00
Ben Mansell
8154dbb7a2 Improved documentation for FastCGI SAPI. Documents the environment 
variable tunings and the new command line usage.
 2002-03-11 14:03:48 +00:00
Ben Mansell
8ac087a232 Add command line option to FastCGI SAPI to make it bind & listen to a 
socket. This makes setting up 'remote' fastcgi much easier.
 2002-03-11 13:37:25 +00:00
Sascha Schumann
a643a467e3 Add a note regarding which version we support 2002-03-11 12:28:16 +00:00
Sebastian Bergmann
3573a92c1a Fix warning, hope this is okay. 2002-03-11 07:58:52 +00:00
Shane Caraveo
c8f5565bf3 woohoo, take some credit! 2002-03-10 22:08:09 +00:00
Shane Caraveo
f3a60dd1a6 children should be zero by default, enable by setting PHP_FCGI_CHILDREN env var. 2002-03-10 21:52:00 +00:00
Shane Caraveo
79bb884eec combine fastcgi capability with regular cgi binary 
include fastcgi library for ease of windows builds
NOTE: included fastcgi library is modified for thread safety, but
	fastcgi support in cgi_main.c is only written for single
	threaded serving.  This does not present any issue for using
	fastcgi.
 2002-03-10 21:39:28 +00:00
Edin Kadribasic
7918fe45b4 Cleaned up previous commit. 
#Oops, commited older patch the first time :)
 2002-03-08 09:55:58 +00:00
Edin Kadribasic
61071e6b7b @- Added -r option to the CLI version of PHP which executes a piece of PHP 
@  code directly from the commmand line. (Edin)
 2002-03-08 09:47:52 +00:00
Sascha Schumann
9d9d39a0de Please welcome the new build system. 
If you encounter any problems, please make sure to email sas@php.net
directly.

An introduction can be found on

http://schumann.cx/buildv5.txt
 2002-03-07 14:20:02 +00:00
Derick Rethans
393cbe0ac3 - Put them back (and do it right) 2002-03-06 13:25:25 +00:00
Derick Rethans
c8740575c4 - Remove unused variables 2002-03-06 11:31:56 +00:00
Derick Rethans
a6738260af - Fix for bug #15572 (Patch by Ralf Nyrén <ralf.nyren@educ.umu.se>) 2002-03-04 17:46:19 +00:00
Sascha Schumann
a2065b8743 Reduce operations in the ub_write loop. 2002-03-04 08:25:20 +00:00
Sascha Schumann
66535c240e Free status line, initialize number_vec, correctly account for 
the number of bytes in the document, avoid strcpy/strlen.
 2002-03-04 08:22:33 +00:00
Alex Waugh
e0a228f55d Updated build instructions 2002-03-03 14:25:59 +00:00
Shane Caraveo
db73f90953 add comment for IIS users 
fix some whitespace
 2002-03-01 06:34:08 +00:00
Shane Caraveo
cd18533a10 This is much better. With FORCE_CGI_REDIRECT turned on by default for compilation, 
we can now define this in the ini file.  So it can be turned on for apache, turned
off for IIS which does not have a redirect issue.  Alternately, a different 'REDIRECT_STATUS'
environment var can be defined in case some web server out there needs it.

new ini vars
cgi.force_redirect 0|1
cgi.redirect_status_env ENV_VAR_NAME
 2002-03-01 01:58:20 +00:00
Shane Caraveo
e2b1161ea6 fix force redirect crash under multithreaded compile 
should be discused: fix redirect detection to only work with apache or netscape,
where we know they set an environment variable regarding redirect.  IIS has
no security issue here.  Don't know about other windows web servers.
 2002-03-01 00:19:01 +00:00
Yasuo Ohgaki
83059ae3de Use {NULL, NULL, NULL} to terminate function entry. 
# It does not fix any bugs, since {0} works also.
 2002-02-28 12:10:36 +00:00
Edin Kadribasic
ca1fdf8a55 Default name of CGI binary changed to php-cgi. 
# Please note that this only applies when installing php with
# make install. The binary is still built as "php" in top build dir.
 2002-02-28 11:48:39 +00:00
Sebastian Bergmann
90613d2282 Maintain headers. 2002-02-28 08:29:35 +00:00
Sebastian Bergmann
e3b86cb645 URLEncoder.encode(string) is deprecated in the Java 2 SDK 1.4. 2002-02-27 07:29:33 +00:00
jim winstead
63669c6a64 make it more clear that --with-apache and --with-apxs only work with apache 1.x. 2002-02-25 18:27:13 +00:00
Holger Zimmermann
46acc391f0 Fixed functionality to read in server variables. 2002-02-23 15:17:00 +00:00
Derick Rethans
9d6c7626da - Reformatting 2002-02-20 10:41:18 +00:00
David Hedbor
aecccb16e9 Fixed environment hashing again. 2002-02-19 20:46:29 +00:00
Alex Waugh
11318ff8ef Updated to new TSRM macros 2002-02-17 12:55:52 +00:00
Derick Rethans
b8a5daf59c - Make the errorcode 255. (Doing docs right away) 2002-02-15 09:06:45 +00:00
Derick Rethans
86fa2d3937 - Let php_execute_script return 0 on failure and 1 on sucess, and change 
SAPIs accordingly. (Andrei, Derick)
 2002-02-14 20:16:08 +00:00
Edin Kadribasic
48f688a261 Turned implicit_flush on. 
Cleaned up help text.
 2002-02-14 16:45:07 +00:00
Edin Kadribasic
f47a9c8af3 Added README file for CLI SAPI. 2002-02-14 16:44:13 +00:00
Sebastian Bergmann
3e845aaea4 Fugbix typo. 2002-02-11 16:29:51 +00:00
Shane Caraveo
14de816ecf now needs getopt 2002-02-02 23:17:10 +00:00
Shane Caraveo
3b81b97c40 an update to stresstest 2002-02-02 23:14:23 +00:00
Sebastian Bergmann
dcd4e0a2ec Remove obsolete CG(extended_info) = 0 calls, we already do this in zend_set_default_compile_time_values(). 2002-02-02 19:53:43 +00:00
Yasuo Ohgaki
866a609208 A fix for the bug number 13231 & 11699. 
Makes the roxen support compile.  Patch by Lars Wilhelmsen <lars@sral.org>
 2002-01-31 10:15:07 +00:00
Edin Kadribasic
13ca332184 Enable extensions to specify that they are not supposed to be 
built with the CLI SAPI. This is done by passing "nocli" as the
3rd parameter to PHP_EXTENSION macro.
 2002-01-30 23:46:44 +00:00
Sebastian Bergmann
ec4bb876a3 Fugbix typo. Update path to /lib/optional. 2002-01-30 20:38:00 +00:00
Jon Parise
ea089d09ae Add a note that this statement will never be reached. 2002-01-27 07:23:21 +00:00
Doug MacEachern
a1b21e0c4c adjust to ap_get_brigade() API change 2002-01-25 04:03:42 +00:00
Edin Kadribasic
fd7ff95fde Added --disable-cli option. 2002-01-24 17:55:13 +00:00
Sebastian Bergmann
43b1d2acd1 Give Edin Kadribasic his due credits. 2002-01-23 13:41:52 +00:00
Edin Kadribasic
f18fade888 No need to dupe this string in cli sapi (Bug #15181). 2002-01-23 13:15:16 +00:00
Edin Kadribasic
1769e3fcdc Fixed bug #9041 and others in the same class (patch by pete.lee@ubs.com) 2002-01-20 23:58:37 +00:00
Doug MacEachern
cb0a09808f adjust to ap_get_brigade and input filter api changes 2002-01-20 18:44:15 +00:00
Edin Kadribasic
f5790b0a7c Modified the build system to make certain extensions (pcntl, ncurses, 
pcntl) only with cgi/cli sapi's. This was done by adding 3rd optional
parameter to PHP_EXTENSION macro which should be set to "cli" if
the extension only makes sense for that class of api's.
 2002-01-20 02:30:18 +00:00
Edin Kadribasic
9504838d7e Merged patch from sapi/cgi. 
# I will try to sync relevant patches from sapi/cgi to sapi/cli
 2002-01-19 22:45:26 +00:00
Shane Caraveo
6120b8dc5a reimplement extension listing 2002-01-18 20:27:09 +00:00
Edin Kadribasic
2af5118d35 Fixed build in the directory other than $top_srcdir. 2002-01-13 23:51:56 +00:00
Edin Kadribasic
a7bbee9d22 This should fix cli build when running 'make install' directly. 2002-01-13 05:26:20 +00:00
Edin Kadribasic
317e1a4636 Fixed CLI build when the main SAPI is built as a shered library. 2002-01-12 22:48:54 +00:00
Edin Kadribasic
db8647203c Modified the build system to always build CLI SAPI. 2002-01-12 14:51:54 +00:00
Edin Kadribasic
b1f3a91569 @- Added CLI (command line intrerface) sapi based on a cut-down version 
@  of the CGI sapi which is more suited for writing shell scripts. Some of
@  the differences are: it prints no HTTP headers, displays plain text
@  error messages, etc. (Edin)
Added CLI (command line intrerface) sapi.
# Let's see if a build expert can make this compile along
# side some other sapi.
 2002-01-06 14:08:14 +00:00
Ben Mansell
0cbbac3c12 Added log_message function to the FastCGI sapi, so you can see error 
output from scripts
 2002-01-04 14:39:46 +00:00
Zeev Suraski
c8315794f1 Fix incompatibility with Windows .NET (IIS 6) 
May also improve stability under other Windows versions
 2001-12-22 03:11:46 +00:00
Hartmut Holzgraefe
052d5fc85d proto fix 2001-12-15 14:23:07 +00:00
Sascha Schumann
5c2d995f0b Provide access to ini settings. 
Properly block the thread, if IO is not ready on a fd.
 2001-12-13 11:15:56 +00:00
Sebastian Bergmann
38933514e1 Update headers. 2001-12-11 15:32:16 +00:00
Sascha Schumann
92a6f2c344 Sent proper encodings for gzip/compress files, otherwise IE won't 
display them.

Refer to section 3.5, RFC 2616 -- these are IANA registered.

Patch submitted to author.
 2001-12-10 14:09:08 +00:00
Sascha Schumann
ef72a765bf Add a nocache feature: If documents are stored under /nocache/, 
appropiate HTTP headers will be sent which prevent client/proxy caching.
 2001-12-10 13:31:41 +00:00
Thies C. Arntzen
f026dae4f2 @- Added -w option to the cgi-version. This will remove all comments and 
@  whitespace from teh script. (Thies)
 2001-12-08 12:27:01 +00:00
Doug MacEachern
1b35f3bcfc apr_table_elts are now const 2001-12-07 05:34:44 +00:00
Doug MacEachern
27018c0ff0 rename functions to match those supported in the apache 1.3 module: 
apache_sub_request -> virtual
 get_all_headers    -> getallheaders
 2001-12-07 05:31:07 +00:00
Doug MacEachern
543d76185d need to call ap_destroy_sub_req() before RETURN_TRUE in apache_sub_req() 
(Jon Parise <jon@php.net>)
 2001-12-06 19:03:29 +00:00
Doug MacEachern
52b711521f destroy subrequests returned from ap_sub_req_lookup_uri 2001-12-06 01:25:48 +00:00
Doug MacEachern
6adebbf162 call to ap_sub_req_lookup_uri() needs to pass ctx->f->next rather than 
NULL for next_filter argument in order for ap_run_sub_req() output to
end up where expected.  ("William A. Rowe, Jr." <wrowe@rowe-clan.net>)
 2001-12-06 00:53:58 +00:00
Hartmut Holzgraefe
2c93a6ac2d proto fixes 2001-12-05 23:01:21 +00:00
Hartmut Holzgraefe
df6f8ba35a proto fix 2001-12-04 22:14:28 +00:00
Sebastian Bergmann
a9b9c68b8a Mark sapi/servlet as what it is: experimental. 2001-12-04 13:20:26 +00:00
foobar
f43b57190c Added missing cvs ids and unified configure messages. 2001-11-30 19:01:32 +00:00
Sterling Hughes
d30044c969 Update to the latest apr api (patch by Clif Woolley) 2001-11-29 11:29:11 +00:00
Frank M. Kromann
1436374c40 Removing winutil.c from this project. the functions needed are found in php4ts.dll 2001-11-27 00:08:36 +00:00
Zeev Suraski
6cacbd75e7 Fix build if PHP_ENABLE_SEH is not defined 2001-11-25 10:01:49 +00:00
foobar
41b21156cc Fixed bugs: #14034, #11647 (can not find any others) 2001-11-19 00:51:06 +00:00
Doug MacEachern
898099adba setup standard CGI variables 2001-11-13 21:40:01 +00:00
Rui Hirokawa
975ed901aa fixed output problem with output buffering handler. 2001-11-11 23:11:23 +00:00
Shane Caraveo
5664afaadc Make the win32 fastcgi compilable with the php4ts projects. 2001-11-10 22:11:03 +00:00
Alex Waugh
e06c1d7c7e New SAPI module for the WebJames server on RISC OS 
@- New SAPI module for the WebJames server on RISC OS (Alex Waugh)
 2001-11-05 12:07:49 +00:00
Alex Waugh
bddb9539f7 Convert PATH_TRANSLATED for RISC OS 2001-11-04 12:46:30 +00:00
foobar
8ea8ebd2de ws fix 2001-10-30 23:27:27 +00:00
foobar
43825a76bb Installing into non-existing dir is not very good idea.. 2001-10-30 23:22:10 +00:00
Sebastian Bergmann
1bbdd3bce1 Cocoon/lib -> xml-cocoon2/lib 2001-10-30 16:55:56 +00:00
Sebastian Bergmann
e2b0768e96 Leftover. 2001-10-28 23:49:59 +00:00
Sebastian Bergmann
6b8670b267 Whitespace changes. 2001-10-28 23:49:03 +00:00
Sebastian Bergmann
43bd681c34 Refinements. 2001-10-28 17:38:37 +00:00
Sebastian Bergmann
610bc7a194 More work on the README. 2001-10-28 15:22:50 +00:00
Sebastian Bergmann
2fa4b31386 javac 1.3 could not find reflect.class before. Also use -O flag when compiling a Release build. 2001-10-28 09:59:00 +00:00
Sebastian Bergmann
6719d80101 Add missing footnotes. 2001-10-28 09:07:37 +00:00
Sebastian Bergmann
1ffea56325 More work on the sapi/servlet documentation. This is still a work in progress. 2001-10-28 09:01:58 +00:00
Sebastian Bergmann
eff53313f5 Another fix for Tomcat 4. 2001-10-27 23:17:19 +00:00
Sebastian Bergmann
cb6e751008 Fix for Tomcat 4. 2001-10-27 23:14:49 +00:00
Sascha Schumann
1f6f91035e Get rid of post_off-hack which was only suitable for POST data 
which fit into the small thttpd read buffer.  Do a small recv
after content-length bytes have been read to accomodate non-conforming
user-agents.
 2001-10-27 12:08:10 +00:00
Sascha Schumann
a3368ababa Improved handling of posts 2001-10-27 11:27:39 +00:00
Sterling Hughes
e967627ad6 no need to free these it seems 2001-10-26 11:17:34 +00:00
Rasmus Lerdorf
95dff71df7 This made no sense before. Hide Authorization in getallheaders() but 
display it from phpinfo()?  Ouch!
@ Hide Authorization header from phpinfo() output in safe_mode (Rasmus)
 2001-10-21 00:03:55 +00:00
Stig Bakken
0cee8df65e * fix module struct in rest of sapi modules 2001-10-12 12:11:48 +00:00
Thies C. Arntzen
838a7a9566 make it work again 2001-10-12 07:50:52 +00:00
Stig Bakken
99687096ca * fix default path in configure help text 2001-10-10 16:14:25 +00:00
Derick Rethans
27fb33e8b7 - More <br> to <br /> fixes 2001-10-09 19:19:21 +00:00
Sascha Schumann
49b44d537f Make the information available whether we are using HTTP/1.1 2001-10-09 15:15:55 +00:00
Derick Rethans
e4ebe9f1ff - Changed <br> to - in PHP_INFO output. 2001-10-09 09:41:10 +00:00
Sascha Schumann
3db3d65d2e typo fix by zoot@zotikos.com 2001-10-02 14:54:46 +00:00
Sascha Schumann
6db3f409d8 Add QUERY_STRING, HTTP_HOST, HTTP_ACCEPT_LANGUAGE to the script 
environment.

Also support setting the INI path from the outside.
 2001-09-30 18:23:28 +00:00
Jeroen van Wolffelaar
eb38ca844b Undo Z_ subst for sapi and ext/yaz 2001-09-27 20:01:23 +00:00
Jeroen van Wolffelaar
c033288573 Back-substitute for Z_* macro's. If it breaks some extension (the script isn't optimal, it parses for example var->zval.value incorrect) please let me know. 2001-09-25 21:58:48 +00:00
Rasmus Lerdorf
1df380da5a new apache_setenv() 
@- add apache_setenv() function for injecting variables into Apache's
@  subprocess_env table.
 2001-09-22 10:11:53 +00:00
Daniel Beulshausen
3a386f8684 fix macro + nuke warning 2001-09-17 12:22:35 +00:00
Sascha Schumann
7c161fe069 WS-fix and directly use ap_psprintf instead of sprintf/ap_pstrdup 2001-09-16 16:03:49 +00:00
Thies C. Arntzen
9938137725 fixed memory_peak resetting 2001-09-16 15:45:25 +00:00
Sascha Schumann
2547f86060 Use $(LINK) for libraries, but $(LINK_CLEAN) for creating programs. 
Also pass only $(CFLAGS_CLEAN) into thttpd's Makefile.
 2001-09-10 17:15:03 +00:00
Daniel Beulshausen
d504c7ca4f let apache2 filter build under win32 2001-09-10 13:04:24 +00:00
Derick Rethans
78747bd2df - Don't wrap lines... this is annoying while coding. 2001-09-09 13:29:31 +00:00
Derick Rethans
eede70a84f - Removed duplicate FETCH() 2001-09-09 10:42:52 +00:00
Daniel Beulshausen
ff5e95b9e3 fix zts build 2001-09-07 11:20:13 +00:00
Rasmus Lerdorf
afa9e65ff4 Damn, went to head instead of the branch - revert 2001-09-06 23:35:39 +00:00
Rasmus Lerdorf
6a2d84ba06 Oops, forgot to add sapi_apache.c to the apache_hooks branch 2001-09-06 23:32:59 +00:00
Sterling Hughes
198e6f3ea7 no need to cast a 'HashTable *' to 'HashTable *' 2001-09-06 22:51:47 +00:00
foobar
e29994166a WS 2001-08-31 22:03:24 +00:00
Zeev Suraski
6bba521dd3 API update 2001-08-31 14:34:40 +00:00
Doug MacEachern
23f1b515a6 add php version component 2001-08-28 06:23:27 +00:00
Doug MacEachern
c614a9ed3d not all MPMs support child_init, 
so move php_apache_server_startup to the post_config phase
(happens at server startup)
 2001-08-28 06:19:58 +00:00
Sterling Hughes
766de15694 Add some editor modes (in the rest of the source) 2001-08-22 04:45:51 +00:00
Zeev Suraski
e140b35b04 API update 2001-08-21 12:57:53 +00:00
Doug MacEachern
9b137805c8 automatically add php input/output filters when give the standard 1.x config: 
AddType application/x-httpd-php .php
with that, no longer need "Set{In,Out}putFilter PHP" configuration for 2.0
 2001-08-20 16:34:45 +00:00
Shane Caraveo
108633e1ab Windows compilation of fast cgi now working. See windows.txt for info. 2001-08-20 05:00:05 +00:00
Doug MacEachern
4829b93fb2 php_input_filter needs to ignore proxy requests 
else it swallows POST data that needs to be sent to the downstream server
 2001-08-19 21:07:50 +00:00
Sterling Hughes
ba4a1f2df2 Pass on proxy requests (fix by Doug MacEachern <dougm@covalent.net>) 2001-08-19 20:28:36 +00:00
Sterling Hughes
244c9ff3c9 Fix warning (Doug MacEachern, dougm@covalent.net) 2001-08-18 01:59:38 +00:00
Sterling Hughes
353f84c190 # f*ck @!e333u49/&§&$T§$&("E""! expandtab, that's it, the default in my 
# vimrc is not noet
 2001-08-18 01:36:29 +00:00
Sterling Hughes
0e12954669 fix crash bug (Doug MacEachern, dougm@covalent.net) 2001-08-18 01:34:19 +00:00
Ryan Bloom
1543904d71 Fix a seg fault in PHP. If a child process is created in the server, 
using apr_proc_create, it will seg fault, because PHP is using a NULL
child cleanup.  To fix this, we have to use the special cleanup function,
apr_pool_cleanup_null.

This also fixes a compiler warning in the ap_log_error call.
 2001-08-17 22:25:13 +00:00
Sterling Hughes
fe7b5a3434 darn noet 2001-08-16 06:09:12 +00:00
Sterling Hughes
b87834a12d Ryan Bloom's fix of my fix. ;) 2001-08-16 06:05:57 +00:00
Sterling Hughes
9395f0e6e2 Fix error logging 2001-08-16 05:19:29 +00:00
Zeev Suraski
8021e65569 Revert an old bogus patch 2001-08-14 23:17:02 +00:00
Daniel Beulshausen
388dfa0483 TSRMLS fixes 2001-08-14 17:31:00 +00:00
Daniel Beulshausen
21cac086e4 TSRMLS fixes 2001-08-14 17:16:19 +00:00
Daniel Beulshausen
ba761ce9b1 TSRMLS fixes 2001-08-14 17:05:53 +00:00
Sascha Schumann
0ccda62835 use an absolute path for symlinking the php library archive 2001-08-14 09:37:25 +00:00
Thies C. Arntzen
e8e401bc2d ypo;-) 2001-08-14 08:33:21 +00:00
Sascha Schumann
98304ba6a0 Use a symlink instead of copying the +6MB library archive during install 2001-08-13 22:34:25 +00:00
Sascha Schumann
96aa97f8b4 Don't display egrep result 2001-08-13 22:17:18 +00:00
Sascha Schumann
f42acb0cd6 whoops, forgot to apply cgi/poll patch before diff'ing 2001-08-13 22:01:55 +00:00
Sascha Schumann
7efc4d8b54 Add check for thttpd-2.21b. We support nothing else for now, because 
this version is rock-stable using the combined set of patches.
 2001-08-13 21:57:31 +00:00
Sascha Schumann
75c22e9a4a improved thttpd-2.21b patch.. I got tired of applying my patches for 
these bugs.

fixes poll(2) issue
fixes hanging cgi issue
fixes off-by-one in scanning input buffers in case of EAGAIN/EWOULDBLOCK
fixes potential bug in managing write buffers
add "index.php" to default files to look for
 2001-08-13 21:55:21 +00:00
Zeev Suraski
1e125df0d1 Reverse patches that slipped in by mistake in a whitespace patch. They 
require some more work...
 2001-08-13 00:36:16 +00:00
Zeev Suraski
f6f6c4d7e6 Whitespace 2001-08-11 16:39:07 +00:00
foobar
18c893d0df killed compile warnings. 2001-08-10 08:36:21 +00:00
Zeev Suraski
6ecae422c4 Use zend_first_try 2001-08-08 14:01:22 +00:00
Sascha Schumann
64c4456cca A CRLF at the end of a line is not so wrong. 2001-08-07 08:35:54 +00:00
Sascha Schumann
61618d4a03 The module usually did not send out Content-Type: text/html. 
No major browser seems to care, Opera does though.
 2001-08-07 08:34:02 +00:00
Frank M. Kromann
96607ebd1a Adding missing TSRMLS_CC 2001-08-06 16:53:16 +00:00
Sascha Schumann
480ffb3d75 more tsrm cleanup 2001-08-05 16:43:57 +00:00
Sascha Schumann
b349df6364 some more eliminate-fetches-or-escalate-them-at-least 2001-08-05 16:21:33 +00:00
Sascha Schumann
373b3e101e more tsrm cleanup -- output.c is not doing any fetches anymore 2001-08-05 15:55:43 +00:00
Sascha Schumann
8aef193056 more tsrm cleanup 2001-08-05 15:29:47 +00:00
Sascha Schumann
2cce13fd50 further tsrm cleanup 2001-08-05 14:27:39 +00:00
Sascha Schumann
0af7ad15f5 further tsrm cleanup 2001-08-05 14:17:55 +00:00
Thies C. Arntzen
578c395411 delay module_shutdown even further. zend_try and _catch need the current 
globals as well.
zeev, is this a chicken & egg problem?
 2001-08-05 14:07:33 +00:00
Thies C. Arntzen
0fe837b448 module_shutdown() calls ts_free_thread in ZTS mode. so SG() cannot be accessed 
afterwards.
 2001-08-05 14:04:23 +00:00
Sebastian Bergmann
7168c31482 Even more TSRM cleanup. 2001-08-05 13:26:54 +00:00
Sebastian Bergmann
47b26817fb More tsrm-related cleanup. 2001-08-05 12:36:13 +00:00
Sascha Schumann
7263485576 tsrm-related cleanup 2001-08-05 10:32:48 +00:00
Sebastian Bergmann
2126ed210e Fixed some TSRMLS_CC instances (at least it looked odd to me the way it was before). 2001-08-05 05:40:43 +00:00
Sebastian Bergmann
a70ecedb33 Remove more duplicate TSRMLS_FETCH() calls. 2001-08-05 05:35:06 +00:00
Zeev Suraski
1159c84ab7 - TSRMLS_FETCH work 
- whitespace fixes
 2001-08-05 01:43:02 +00:00
Sebastian Bergmann
b99798fda0 Another one bites the dust. 2001-08-04 17:07:16 +00:00
Sebastian Bergmann
b5763a70a6 Remove duplicate TSRMLS_FETCH() call. 2001-08-04 17:02:43 +00:00
Zeev Suraski
2ec440078a Get rid of a couple of bogus persist_alloc()'s, and some cleanup 2001-08-03 07:15:14 +00:00
Sebastian Bergmann
25076098c0 Revert whitespace patch. 2001-08-03 05:05:47 +00:00
Sebastian Bergmann
fcfea1c55d Whitespace fixes. 2001-08-02 15:16:43 +00:00
Sebastian Bergmann
010c3b44ed Fix Apache2Filter build. 2001-08-02 15:14:30 +00:00
Zeev Suraski
12318a2068 Fix Apache/ZTS build 2001-08-01 22:53:26 +00:00
Sterling Hughes
e7ea61ad98 remove duplicate TSRMLS_FETCH() 2001-07-31 23:44:20 +00:00
Zeev Suraski
b1de7fc900 More TSRMLS_FETCH annihilation. Enough for today... 2001-07-31 07:09:49 +00:00
Zeev Suraski
bc42c37513 More TSRMLS_FETCH work. Got it under 400 now. 2001-07-31 06:28:05 +00:00
Zeev Suraski
d76cf1da18 More TSRMLS_FETCH work 2001-07-31 04:53:54 +00:00
Thies C. Arntzen
b1cc3bd1d6 fix compile 2001-07-30 14:52:16 +00:00
Thies C. Arntzen
5f6e3db13f compile fix 2001-07-30 14:25:29 +00:00
Zeev Suraski
c43806f415 Zend compatibility patch 2001-07-30 08:24:42 +00:00
Zeev Suraski
797a079a95 More TSRMLS_FETCH work, and a bit of cleanup 2001-07-30 06:18:13 +00:00
Zeev Suraski
7b1c400631 More TSRMLS_FETCH annihilation (Zend compatibility patch) 2001-07-30 04:58:07 +00:00
Zeev Suraski
1c25b8dd53 Avoid TSRMLS_FETCH()'s, and clean up a bit of stale extern's and layout on the way 2001-07-30 01:56:43 +00:00
Rasmus Lerdorf
15ae74d3ba Fix typo 2001-07-28 14:01:24 +00:00
Zeev Suraski
dde79b86c5 Build fix 2001-07-28 12:05:15 +00:00
Zeev Suraski
63829bc949 Some more fixes 2001-07-28 12:02:42 +00:00
Zeev Suraski
d87cc976e1 Redesigned thread safety mechanism - nua nua 2001-07-28 11:36:37 +00:00
Zeev Suraski
fe6f8712a4 - Get rid of ELS_*(), and use TSRMLS_*() instead. 
- Move to the new ts_allocate_id() API
This patch is *bound* to break some files, as I must have had typos somewhere.
If you use any uncommon extension, please try to build it...
 2001-07-27 10:16:41 +00:00
Zeev Suraski
e280c3e555 Fix a corrupted memory access 2001-07-27 07:37:16 +00:00
Sascha Schumann
7c43206fb8 Remove unneeded variables 2001-07-26 18:10:38 +00:00
Zeev Suraski
536a53356d Get rid of the redundant global startup code 2001-07-24 20:30:37 +00:00
Sascha Schumann
a95101669d Handle file buckets for now; that allows us to pass something to the 
engine which it can handle.
 2001-07-23 04:50:13 +00:00
Sascha Schumann
36c2353046 Remove accidentially committed line 2001-07-23 02:39:59 +00:00
Sascha Schumann
bd573e42ad Call php_request_shutdown only, if the startup was successful. 2001-07-23 02:06:16 +00:00
Sascha Schumann
36be1040eb Use synchronous php_request_shutdown in the standard case and 
let the pool cleanup function only become effective, when an
error has occured.

This fixes the problem that the request_conn was already dead
when the request_shutdown was reached.
 2001-07-23 01:03:22 +00:00
Zeev Suraski
6fa5ac832f Fix Apache build 2001-07-21 16:18:03 +00:00
Andi Gutmans
4715403906 - Fix __FILE__ in the main script in CGI/command line mode. 2001-07-21 15:11:30 +00:00
Zeev Suraski
336004f4bc Improved bailout mechanism, supports nested bailouts a-la try..catch 
Note:  You may *not* return directly from a catch block
 2001-07-21 14:27:56 +00:00
Holger Zimmermann
7213492b3a Updated 2001-07-21 12:23:23 +00:00
Holger Zimmermann
31252e854b Updated 2001-07-20 22:11:13 +00:00
Holger Zimmermann
1b03f89fa0 Updated 2001-07-20 21:10:57 +00:00
Holger Zimmermann
a088c2e19d Updated PHP mode, fixed indent mode, added syntax check mode 2001-07-20 21:00:17 +00:00
Zeev Suraski
85b4df53c0 Improved interactive mode - it is now available in all builds, without any significant slowdown 2001-07-15 14:08:58 +00:00
Zeev Suraski
551f1831a7 Fix a major thread safety bug in the output mechanism 
@- Fixed a major memory corruption bug in the thread safe version (Zeev)
 2001-07-02 18:17:10 +00:00
Ben Mansell
c053f12207 Fix FastCGI shutdown for MacOSX, it didn't want to die. 2001-07-02 12:37:47 +00:00
Ben Mansell
d5cf0abac3 Make the FastCGI module behave nicer when trying to shut it down. If you 
kill the parent process, then it will kill all its kiddies for you.
Also, now refuses to run as a CGI (since it doesn't work that way), and
corrected a few debug messages.
 2001-06-30 17:03:52 +00:00
Sascha Schumann
e6d153f6c4 Support for handling multiple concurrent requests. 2001-06-23 16:27:56 +00:00
Sascha Schumann
0bbe77309d Accomodate an Apache API change 2001-06-22 23:20:49 +00:00
Zeev Suraski
8332ab409a Spit out errors 2001-06-21 14:18:23 +00:00
Sascha Schumann
e843e8c5f0 Move PHP_TARGET_RDYNAMIC check to global acinclude.m4 and use it 
in thttpd's config.m4.
 2001-06-15 12:53:20 +00:00
David Hedbor
6b0f88e828 Fix segfault when env vars are missing. 2001-06-08 16:31:22 +00:00
Sebastian Bergmann
49ab8cb8f1 Remove bogus '.'. 2001-06-06 13:24:17 +00:00
Rasmus Lerdorf
81e2cf03ac Fix folding and clean up some extensions 2001-06-06 13:06:12 +00:00
Martin Kraemer
f2002d3e41 Oops, sorry. I should not have committed this ebcdic fix (which was none) 2001-06-01 12:58:41 +00:00
Sascha Schumann
d342acc3a9 Add TUX SAPI module 2001-05-26 23:58:38 +00:00
Sascha Schumann
1ad2a710ab Use EXTRA_LDFLAGS at this point. 
I've confirmed that one can build a working Apache DSO module now
(AIX 4.2 with gcc 2.95.2 and Apache 1.3.12).
 2001-05-23 21:23:16 +00:00
Martin Kraemer
c96d652843 Fix Basic auth (when under PHP control) for EBCDIC platforms 2001-05-23 15:24:53 +00:00
Shane Caraveo
f0b6b8ab52 The -c commandline option was not working at all, need to set the path 
override before calling on the module startup.
 2001-05-22 23:05:08 +00:00
Sascha Schumann
40245019cc s/^I/ / and some re-indenting. Also align the APXS checking code 
with the standard scheme.
 2001-05-19 17:13:09 +00:00
Sascha Schumann
b56e877e53 Reindent, add link map for AIX, improve diagnostic message, 
carry over all -D* CPPFLAGS, and nuke REGEX recognition.
 2001-05-19 17:02:09 +00:00
Sascha Schumann
bc7a582f84 Use write(2), if we can successfully write to stdout. 2001-05-19 14:30:33 +00:00
Sascha Schumann
e29a1b2230 First try at using Apache's export list when building a DSO. 2001-05-18 20:53:53 +00:00
Thies C. Arntzen
e80abfa40c revert parts of last commit - stupid me! 2001-05-18 14:40:02 +00:00
Thies C. Arntzen
2db3431f00 --enable-memory-usage-info id deprecated. use --enable-memory-limit instead! 2001-05-18 14:32:05 +00:00
James Moore
6026a36879 Merge the more sensible way of doing this back in to HEAD 2001-05-17 23:57:43 +00:00
James Moore
873d59a8ea @ - Fixed getopt so it accepts arguments in the form -<option><value> not 
@   just -<option> <value> (jmoore)
 2001-05-17 21:32:05 +00:00
Zeev Suraski
89c7b891c9 Add missing info 2001-05-17 13:31:45 +00:00
Sterling Hughes
0492f086e7 # Revert the SLS_FETCH() ;) 2001-05-16 18:28:18 +00:00
Sterling Hughes
2d84ecbba8 Remove redundancy 
# And further fix problem ;)
 2001-05-16 18:15:49 +00:00
Sterling Hughes
4565812470 fix windows build. 
#untested
 2001-05-16 18:10:06 +00:00
Zeev Suraski
260b4d0dbf Merge memory usage into memory limit 2001-05-16 15:02:30 +00:00
Daniel Beulshausen
e1a9871337 add missing apls_fetch 2001-05-16 09:01:20 +00:00
Zeev Suraski
d1845fb138 Move the initialization to a safer place (earlier, it could end up 
not being reset to 0 under certain circumstances)
 2001-05-15 14:55:42 +00:00
Daniel Beulshausen
0f60b4b8a5 fix typo 2001-05-14 10:30:30 +00:00
Zeev Suraski
0113263991 Safer detection of recursive PHP invocations 2001-05-13 09:03:46 +00:00
Sascha Schumann
afdaee9e47 Nuke more quotes 2001-05-12 11:09:05 +00:00
Sascha Schumann
718b588b14 Fix indentation of ./configure --help messages. 2001-05-12 09:13:42 +00:00
Thies C. Arntzen
169febcdf0 @- Added --enable-memory-usage-info. This creates a new Apache 1.x logging 
@  directive "{mod_php_memory_usage}n" which will log the peak amount of
@  memory used by the script. (Thies)
 2001-05-11 18:17:08 +00:00
Zeev Suraski
4afa93f716 @- Fixed a possible crash in the PHP CGI when no input file is 
@  specified (Zeev)
Fixed bug 7822
 2001-05-10 14:13:18 +00:00
Zeev Suraski
6cd3b987b8 $argc was off by one in -f (fix bug #9289) 2001-05-08 00:51:11 +00:00
Zeev Suraski
910e9d068c whitespace 2001-05-07 22:02:44 +00:00
Zeev Suraski
d229f82a46 Allow virtual() of PHP files. We may have to improve the detection code a 
bit, but it worked well on everything I tried.
 2001-05-07 11:07:22 +00:00
David Hedbor
935d6287fd Patch from Jan Legenhausen to add vars to the HTTP_SERVER_VARS array. 2001-05-07 06:43:37 +00:00
Ben Mansell
13e4699ae3 Removed a duplicate php_import_environment_variables() call 
from fastcgi sapi
 2001-05-04 09:49:14 +00:00
Sascha Schumann
e337f07ecd Replace slow strlcpy with a quick memcpy. 2001-05-03 09:04:15 +00:00
Andi Gutmans
8975186810 - Another strncpy() -> strlcpy() change 2001-05-02 22:53:41 +00:00
Ben Mansell
98af7a8d7d Patch from Stephen Landamore: speed up the environment merging by 
using memcpy instead of putenv.
 2001-05-02 17:19:58 +00:00
Andi Gutmans
a166b6146b - Remove unused variable 2001-05-01 07:16:57 +00:00
Sterling Hughes
ba49860cc8 fix for bug 6491, http://www.php.net/bugs.php?id=6491, removes a bit of 
(what I think is) broken logic.

#  This is as discussed on the mailing list previously.  This change
#  does fix the problem, however, the extra code was in there for a
#  reason (I'm guessing :), i'm ready to revert this patch in a jiffy
#  if someone has a good reason why that (just removed) extra logic
#  should be in there.
 2001-05-01 03:48:27 +00:00
Andi Gutmans
6196e0bc4d - Fix for Bug id #10071 
PR:
Submitted by:
Reviewed by:
Obtained from:
 2001-04-30 22:47:51 +00:00
Andi Gutmans
4c823e8a89 - Change macros from V_ to VCWD_ because of AIX name clash 2001-04-30 12:45:02 +00:00
Daniel Beulshausen
59f3775f7c add/fix pi3web dsp 2001-04-28 18:46:56 +00:00
Sascha Schumann
6602b48071 Fix optimization -- we did not send out custom Response Status Lines. 2001-04-25 06:42:24 +00:00
Sascha Schumann
ab1df8dfb9 Accomodate Apache HTTPD 2.0 API change 2001-04-24 12:57:34 +00:00
David Hedbor
d522a6a25e Disable use of th_farm since it doesn't seem to work. Uses a Pike layer 
thread farm now instead.
 2001-04-24 01:08:35 +00:00
Sascha Schumann
ff423ef9d9 remove Only.* lines from patch 2001-04-22 14:33:57 +00:00
Sascha Schumann
0fc2ca64bf bytes in the conn structure was renamed to bytes_sent. 2001-04-22 14:22:40 +00:00
Sascha Schumann
38e55b3249 Update patch to thttpd-2.21 2001-04-22 14:00:53 +00:00
Stig Bakken
0b2641efa6 @Added -C command-line option to avoid chdir to the script's directory (Stig) 2001-04-16 23:20:47 +00:00
Sascha Schumann
466c226415 Revert mega patch. 
This patch has at least the following deficiences:

- the CGI is built using objects from another SAPI module.
  This usually results in unsatisfied symbol references.
- the CGI makefile is not created properly
- building CGI cannot be disabled
 2001-04-09 15:47:19 +00:00
Stig Bakken
a4877d7afd * CGI version is always installed! 
* replaced --disable-pear with --with-pear=DIR (or --without-pear),
  is backwards compatible
* use --datadir, --libdir and --sysconfdir configure options to determine
  where PEAR files, shared extensions and php.ini goes
* simplified the extension version directory name
 2001-04-08 22:30:17 +00:00
Holger Zimmermann
23f3187b6f Contribute the MSVC project file. Someone could add this to the php4ts workspace. 2001-04-08 11:04:27 +00:00
Holger Zimmermann
8c0f71e7b3 Reorganized the #define's in the header. 2001-04-08 10:49:07 +00:00
Holger Zimmermann
9b7aa43dd4 Updated copyright agreement regarding move of Pi3Web to sourceforge. 2001-04-08 08:25:20 +00:00
Sascha Schumann
d8b3bdf3bc Fix static Apache builds which were broken by the last commit. 2001-04-05 10:56:04 +00:00
Wilfredo Sanchez
cb71c4c2d0 Separate CPPFLAGS from CFLAGS. 2001-04-03 23:30:49 +00:00
Wilfredo Sanchez
0df6e8dd88 Add INSTALL_ROOT variable to specify install location. 2001-04-03 20:59:50 +00:00
foobar
8a26918ed1 Renamed the AC_ prefixed macros defined in acinclude.m4 to PHP_* prefixes. 
# Heads up people! I tested this before committing but you never know..
 2001-03-27 20:35:04 +00:00
Ben Mansell
afbcd5c4eb Changed header handling; before, we were somehow losing 
Content-Type: text/html
 2001-03-27 15:16:34 +00:00
Ben Mansell
4549e389bb Fix a bug with POST requests. If the Content-Type header wasn't present, 
we were setting SG(request_info).content_type to NULL, instead of
an empty string. This was stopping PHP from processing the data.
 2001-03-22 18:54:51 +00:00
Ben Mansell
87bc51fc5c Fix a bug with POST requests. If the Content-Type header wasn't present, 
we were setting SG(request_info).content_type to NULL, instead of
an empty string. This was stopping PHP from processing the data.
 2001-03-22 18:48:51 +00:00
Ben Mansell
2c8c9d68d7 Altered README.Zeus to give instructions on building FastCGI. 
Changed --with-zeus configure option into --with-isapi, since its more
descriptive (and since there are now different ways to configure PHP+Zeus)
 2001-03-19 11:23:57 +00:00
Ben Mansell
08df6f9b67 @ New FastCGI server module 
New FastCGI server module. Based on the thttpd server module with
large chunks of code ripped from the cgi module. Also modifies
Makefile.in and configure.in in order to make it build properly.
# This initial checkin has been tested with the Zeus web server,
# but should work with any server that has a correct FastCGI
# implementation.
 2001-03-19 11:03:29 +00:00
Stanislav Malyshev
5c1f7a2f60 Fix off-by-one on config values set from Apache config 
# It didn't really hurt, since the extra character was always \0,
# but the phpinfo() display came out ugly.
 2001-03-13 18:39:38 +00:00
Sascha Schumann
5708ddf171 Replace memcpy and sprintf with smart_strs. 2001-03-13 17:14:47 +00:00
foobar
f4917d49c3 Fixed the help for other options too. 2001-03-07 13:24:12 +00:00
Ben Mansell
515c20da47 Added support for Zeus SSL client certificate information. 
Added SERVER_SIGNATURE to the environment.

Submitted by: daniel@zeus.com
 2001-03-07 10:28:00 +00:00
Zeev Suraski
800950c5a7 Avoid using ret uninitialized 2001-03-06 15:10:53 +00:00
Ben Mansell
a40f208ab8 Thread hashtable was being initialized with a size of 1! Changed to 128 as 
a more sensible number.
# Also could change the 'expected resources' parameter from 1, but I
# haven't tested that bit yet
----------------------------------------------------------------------
 2001-03-06 15:09:15 +00:00
Zeev Suraski
559c254f8f Avoid writing to error_log in case of aborted connections. 2001-03-06 15:00:08 +00:00
foobar
356fc41a0a Fix help text for -f 2001-03-05 15:08:36 +00:00
foobar
81a2669216 Can't output any error messages if there isn't any function initialized 
to do it..
# Bug report: #7650
 2001-03-05 01:26:36 +00:00
Zeev Suraski
ce39c56c8b whitespace fix 2001-03-04 01:08:46 +00:00
Sascha Schumann
de6c69f716 Combine all HTTP headers into a single writev 2001-03-02 17:01:52 +00:00
Andi Gutmans
abb18a7918 - Commit NSAPI patches. 2001-03-02 15:25:51 +00:00
Sascha Schumann
2da359bb84 httpd-2.0 cvs seems to be busted. I'm getting very strange backtraces 
and the header filter still seems to be broken.  Will try later.
 2001-02-28 14:19:15 +00:00
Sascha Schumann
a824c87e6d Now it actually loads, but it segfaults upon a request. 2001-02-28 14:11:34 +00:00
Sascha Schumann
6ed0cbb140 Make the module compile again with the latest httpd-2.0 cvs. 2001-02-28 14:03:58 +00:00
Ben Mansell
5e5f5886ff Added PHP_AUTH_USER, PHP_AUTH_PW and PHP_AUTH_TYPE environment variables 
for Zeus/ISAPI, so basic authenication works.

Submitted by: daniel@zeus.com
 2001-02-27 13:29:21 +00:00
Andi Gutmans
a0d3c5a88e - Finally rename modules.h to zend_modules.h for consistency (first try 
was 2000-03-11).
- Remove the first_arg_force_ref[]; and friends extern from php.h as they
  are included via zend_API.h
 2001-02-26 18:14:50 +00:00
Andi Gutmans
eb6ba01d1c - Fix copyright notices with 2001 2001-02-26 06:11:02 +00:00
Sascha Schumann
adb3e3992c php_register_command_line_global_vars only needs file scope. 2001-02-24 21:07:07 +00:00
Sascha Schumann
280e10aac7 Neither the CGI nor the Servlet SAPI module call syslog, so remove 
references to the syslog include files.
 2001-02-24 21:05:02 +00:00
Sascha Schumann
d516726329 Change the default to assumption that people don't use AOLserver 3.0 anymore. 2001-02-24 13:14:27 +00:00
Sascha Schumann
c2fb53bed7 Finish fopen-wrappers rename. 2001-02-23 22:07:16 +00:00
Sascha Schumann
4a32816f9e If we cannot send the header, we don't need to continue with the page. 2001-02-21 20:25:53 +00:00
Sascha Schumann
328ca1b178 There is no need to declare ap_php_(opterr|optopt) with external linkage 
as they are not used outside of getopt.c.

PR: #9364
 2001-02-21 07:41:01 +00:00
Sascha Schumann
2403578e35 Include <sys/uio.h>. Apparently, the header cleanup in glibc 2.2.2 
caused that file to be included by accident.
 2001-02-19 10:28:08 +00:00
Sascha Schumann
8c92cdd897 Save 50% of the syscalls when writing the HTTP header. 2001-02-18 19:03:36 +00:00
Ben Mansell
f49d4de599 Fixed non-threadsafe code: 'isapi_special_server_variables' was a static 
buffer, and not allocated per-connection. Bad bad bad!
 2001-02-16 16:01:34 +00:00
David Hedbor
140279fc7b Fixed PHP authentication and some other minor things. 2001-02-09 05:32:42 +00:00
Sascha Schumann
9db16758b3 Make fprintf's optional 2001-02-08 16:26:18 +00:00
Rasmus Lerdorf
0d0a8f55d6 Kill warning 2001-01-22 01:13:49 +00:00
Zeev Suraski
3793dc18f2 Sigh. Even less sleep than I thought :) Really fix it this time. 2001-01-22 01:10:21 +00:00
Zeev Suraski
9a02c9993d Too much work, not enough sleep... Fix hash lookup 2001-01-22 01:08:28 +00:00
Zeev Suraski
6255a24f1c Don't overwrite PATH_TRANSLATED if it exists 2001-01-22 00:06:52 +00:00
Ben Mansell
12537e9787 @ Support Zeus 3.3.8 
Added changes to environment variable manipulations, to support Zeus 3.3.8
and increase compatibility between Zeus/IIS/Apache. Now, URLs like
http://foo.org/file.php/a/b/c/d work correctly.
# While testing, it looks like IIS+ISAPI is mishandling URLs like the above.
# The PATH_TRANSLATED given by ISAPI includes the /a/b/c/d bit of the URL,
# so using this var to find the script file to open on disk will not work.
# We now use SCRIPT_FILENAME if it is present (in Zeus 3.3.8)
# IIS doesn't seem to set this variable, it might be necessary to mangle
# SCRIPT_NAME and APPL_PHYSICAL_PATH together?
 2001-01-16 10:44:52 +00:00
Zeev Suraski
a910f8cc80 Fix output dir 2001-01-15 15:16:30 +00:00
Zeev Suraski
9877acdb32 - Implement CompareStringWithFile() 
- Remove a stupid NULL assignment that slipped in the last commit
 2001-01-15 15:13:50 +00:00
Zeev Suraski
47ea52ca58 - Implement quick file comparing routine 
- Fix crash - wait on the threads themselves, not on Event objects.
  It takes time between the time a thread signals the event, and the
  time it actually terminates (shutdown code) - so FreeLibrary() and
  the main() termination could occur before all of the threads
  terminated...
 2001-01-15 14:55:30 +00:00
Sascha Schumann
f6eae19147 Try harder to push data through the wire. 
I just learned that the AOLserver module will be used for a 100k users
webmail service.  Wheee!
 2001-01-15 14:48:14 +00:00
Shane Caraveo
42b1b44ad4 test now produce valid OK or FAIL. 2001-01-15 01:52:47 +00:00
Shane Caraveo
ebe94513cc dont do results if not using test files 2001-01-15 01:17:44 +00:00
Shane Caraveo
1d40310fa4 clean up temp files 2001-01-15 01:13:51 +00:00
Shane Caraveo
c88be3f8b3 check files open 2001-01-15 00:57:16 +00:00
Shane Caraveo
833ba12664 fix file reading, add results 2001-01-15 00:56:23 +00:00
Shane Caraveo
dd01542bad Multithreaded stress test program for isapi module now supports phpt files 
still stuff to do before it's realy done, but does run the tests, just need
to get it to compare results right now.
 2001-01-15 00:29:49 +00:00
Sascha Schumann
ae92ebb92b Especially on FreeBSD it seems to be common that send(2) does not 
do a decent job.  We handle that better now.
 2001-01-10 13:51:58 +00:00
Sascha Schumann
de847f60ba Propagate the response code/HTTP status code back to thttpd for logging. 2001-01-09 09:01:33 +00:00
Sascha Schumann
7dd166e8c0 Account the number of sent bytes properly 2001-01-09 08:45:05 +00:00
Sascha Schumann
426d4104ea Make Apache 2.0 filter build again 2001-01-08 23:18:47 +00:00
Shane Caraveo
b2cb9ac8fe ignore blank lines 2001-01-08 01:14:49 +00:00
Shane Caraveo
0a1d3aa108 add notes on this program 2001-01-08 00:10:06 +00:00
Shane Caraveo
a1c3f92ac7 stresstest is based on cgiwrap. it can be used to debug php4isapi.dll without 
the use of an actual web server.
 2001-01-07 23:52:18 +00:00
Shane Caraveo
f1afd6f487 define flag to turn off exception handling 2001-01-07 23:45:24 +00:00
Daniel Beulshausen
0d258cc523 make threaded apache module build again 2001-01-05 17:00:07 +00:00
Zeev Suraski
43a7643453 Fix last couple of problematic execution paths that could corrupt the INI values 2001-01-03 22:45:11 +00:00
Zeev Suraski
60776dbeeb Fix Apache module and remove excess elements from the SAPI structure 2001-01-03 11:56:00 +00:00
foobar
c5da386dbd Fix compile. 2001-01-03 11:39:09 +00:00
Zeev Suraski
bd0ac7fe14 Many patches. I hope I remember them all: 
- Make sapi_module available to external modules (PHPAPI)
- Make the php.ini path reported in phpinfo() always point to
  real full path of the php.ini file
- Optimized the ISAPI module not to read unnecessary server
  variables and read necessary variables at most once.
 2001-01-02 22:49:31 +00:00
Zeev Suraski
0048312fa6 Fix a few possible bugs: 
- engine=off in one or more vhosts could propogate to other vhosts
- Under some error situations, the default values for INI directives
  could be erroneously replaced for a single request
 2000-12-30 00:38:47 +00:00
Holger Zimmermann
7af7199a17 Minor update regarding new phpinfo table format. Moved pi3web_sapi.h to the sapi module. 
PR:
Submitted by:
Reviewed by:
Obtained from: Pi3Web
 2000-12-28 08:31:42 +00:00
Zeev Suraski
a697d076bc Add Release_TSDbg support. This mode compiles PHP with the release C runtime, 
but with optimizations disabled and with debug info.  Some crashes can only
be debugged using this mode.
 2000-12-26 22:15:32 +00:00
Zeev Suraski
aa6d2ac5d0 Heads up people! 
Updated the get_current_key() API - the relevant authors, please take
a look at the updated code and make sure it's ok...
 2000-12-22 12:57:09 +00:00
Sascha Schumann
7f96af83b2 Stop automatically passing vars to AC_SUBST through PHP_SUBST. 
There are some variables which are needed for Makefiles and files
created by AC_OUTPUT; we use PHP_SUBST_OLD for those now.

genif.sh was moved to an appropiate place.
 2000-12-20 17:21:37 +00:00
Andi Gutmans
86a1cace27 - Make all places use MAXPATHLEN in the same way. It includes the 
terminating NULL.
 2000-12-16 20:52:43 +00:00
Sam Ruby
a472edb99b AIX's XlC++ does not allow casts as an lvalue. 2000-12-16 00:15:56 +00:00
Ben Mansell
fbf699adb6 Fix Zeus' behaviour with URL, SCRIPT_NAME, SCRIPT_FILENAME, REQUEST_URI 
environment variables
PR:
Submitted by:
Reviewed by:
Obtained from:
 2000-12-15 16:18:55 +00:00
Daniel Beulshausen
3b20a425c9 added missing SLS_FETCH() 2000-12-14 22:16:21 +00:00
Ben Mansell
a017a6c025 (Zeus) Re-added some server variables that will be used. 
Also added DOCUMENT_ROOT, was missing before for non-Win32
 2000-12-13 17:11:01 +00:00
Sascha Schumann
276cb7cdb1 Add apache_child_terminate() and INI setting apache.child_terminate 
which defaults to 0.

Submitted by: Sam Liddicott <sam.liddicott@ananova.com>
 2000-12-13 13:19:56 +00:00
Sascha Schumann
104311042c Add TODO note 2000-12-11 08:05:53 +00:00
Sascha Schumann
107aa9f71a Align ZTS handling of globals with common usage 2000-12-10 23:22:20 +00:00
Daniel Beulshausen
d41137fedf fix win32 apache module 
# this is ugly, has someone a better way?
 2000-12-10 22:40:07 +00:00
Daniel Beulshausen
1f31360f01 fix windows build 2000-12-10 22:06:07 +00:00
David Hedbor
9147a81a19 Fix for Pike 7.1 (error -> Pike_error). Caudium bug #12486. 2000-12-07 19:01:13 +00:00
Sascha Schumann
0ddb725f91 Axe rest of DAV leftovers and use STD_PHP_INI_ENTRY in the INI section 2000-12-07 13:07:18 +00:00
Sascha Schumann
7e28784de3 Fix indentation of configure output 2000-12-06 17:34:58 +00:00
David Hedbor
694a5620e4 Removed a fatal condition to allow for harmless user error plus some other 
small changes.
 2000-12-04 23:12:40 +00:00
Sascha Schumann
dedec6614e Automatically carry over macro definitions from Apache. 
We don't take everything, because apxs' CFLAGS also includes
optimization, debugging, et cetera flags.

PR: #7211
 2000-12-04 16:05:00 +00:00
Sascha Schumann
c95a8f39b9 Merge with php_4_0_4 2000-12-03 08:37:43 +00:00
David Hedbor
1731fb0c67 Minor cosmetic changes. 2000-12-01 23:34:01 +00:00
David Hedbor
bb1d16c122 More config.m4 fixes. 2000-12-01 23:10:49 +00:00
David Hedbor
8d48566c6f Updated config test to also work with debian pike 7 cvs etc. 2000-12-01 22:23:37 +00:00
Hartmut Holzgraefe
929197cf83 merged ext/apache/CREDITS and sapi/apache/CREDITS 2000-11-22 23:04:33 +00:00
Sascha Schumann
6c1af20310 Set the exit status from the return value of php_execute_script() 2000-11-22 04:24:04 +00:00
Hartmut Holzgraefe
1f6878e912 2nd step towards auto-credits 2000-11-20 10:33:33 +00:00
David Hedbor
49014ed560 Patch to find module dir 2000-11-19 09:10:16 +00:00
Zeev Suraski
030b707296 Update SAPI modules to interface with the new TSRM. 
Enable thread-safety memory debugging in ISAPI when in debug mode
 2000-11-18 02:44:04 +00:00
Sascha Schumann
4bb564ad2b Clear idle_read_timer 2000-11-15 23:37:50 +00:00
Zeev Suraski
0f7f5c2c0e - Import Jade Nicoletti's transparent gzip encoding support as an output 
handler.  Works quite nicely!
- Fix buglets in output buffering
- Add output_handler INI directive
 2000-11-13 18:54:37 +00:00
Sascha Schumann
39f8c9807e Update patch and add persistent connection handling 2000-11-13 13:33:12 +00:00
Sascha Schumann
3fbfbf1f45 Add thttpd-dependent interface for maintaining persistent connections on 
an iterative web-server. This will be used by the IRCG extension.
 2000-11-13 13:23:56 +00:00
Sascha Schumann
04f180b08a More verbose error message for non-working apxs case 2000-11-13 12:43:44 +00:00
Sascha Schumann
8658cace16 Add note about serialized requests and their impact 2000-11-13 12:39:15 +00:00
Sascha Schumann
6a149caaed Fix aborted connection handling and stop modifying thttpd data 2000-11-12 21:10:09 +00:00
Sascha Schumann
86b8e890dc strdup private AOLserver data before inserting it into SAPI's request_info. 2000-11-11 18:35:15 +00:00
Sascha Schumann
802d716c0d Update README 
Make Apache-related functions build

Add get_all_headers()

Fix segfault when SAPI outputs strings of length 0

Move request ctor/dtor into their own functions
 2000-11-11 18:24:27 +00:00
Zeev Suraski
9e40204f00 @- In CGI mode, $HTTP_SERVER_VARS now includes all of the environment variables 
@  as well (Zeev)
 2000-11-07 18:25:29 +00:00
David Hedbor
6f0014982d Noted that setting of multiple headers with the same name is fixed. 2000-11-06 22:12:11 +00:00
David Hedbor
61f2088846 (php_caudium_set_header): Allow for multiple headers with the same name. 2000-11-06 22:11:10 +00:00
Zeev Suraski
efd8117fd4 Fixed a bug in $argv and $argc not being properly defined in command-line mode 
@- Fixed a bug that prevented $argv and $argc from being defined in the command
@  line version of PHP (Stas)
 2000-11-06 09:55:53 +00:00
Stanislav Malyshev
24035faa29 I guess SG(request_info).argv0 and not !SG(request_info).argv0 was an intent, otherwise it doesn't make much sense. 2000-11-06 09:31:48 +00:00
Sascha Schumann
e7a632e950 Add apache_sub_req() 2000-11-06 01:46:28 +00:00
Rasmus Lerdorf
5a58b723ec Remove apache2 sapi module in favour of Sascha's apach2filter 2000-11-05 17:41:03 +00:00
Rasmus Lerdorf
1f3273481e We need a space after 'dnl' to comment stuff out. Why not just delete 
this stuff now?
 2000-11-05 17:31:17 +00:00
Rasmus Lerdorf
ed218bb6b4 dnldnl won't work 2000-11-05 17:29:04 +00:00
Sascha Schumann
a6a792ecdd Outcomment everything. Since this is an exact duplicate of apache/config.m4, 
it might cause conflicts.
 2000-11-05 15:59:58 +00:00
foobar
3e8ac5d7f8 Fix build. 
# next time: CHECK that things WORK before committing..
 2000-11-03 16:30:55 +00:00
Daniel Beulshausen
5e48df787a use argv[1] if it's given, thanks to Bob Denny <rdenny@dc3.com> 2000-11-03 09:55:54 +00:00
David Hedbor
1497e148f4 Use V_CHDIR_FILE instead of doing the job of that function myself and 
added a define to disable the use of threads for debugging purposes.
@Support for the Caudium webserver (http://caudium.net/) added. It's based
@on the Roxen SAPI module. Many bugs have been identified and fixed. (David)
 2000-11-03 00:29:05 +00:00
Sascha Schumann
51ec089429 Setting no_cache causes Expires: to be send, which is not what we want. 
Also disable ETag. It does not serve any purpose for dynamic pages.

Finally, disable keep-alive connections again, since we don't know
the content-length for sure.
 2000-11-03 00:11:42 +00:00
David Hedbor
2986b89e1d Now correctly detects Pike 7.0 and use the alternative code. It also sends the 
number of written bytes to the done callback function.
 2000-11-02 20:05:24 +00:00
David Hedbor
a878709db3 Changed contact information. 2000-11-02 18:56:42 +00:00
David Hedbor
838264de75 Added notice about Caudium websites. 2000-11-02 18:54:21 +00:00
David Hedbor
8aa6f6d55c Initial caudium support. 2000-11-02 18:53:47 +00:00
Sascha Schumann
a44361a769 Update. Someone should really write better docs. =) 2000-11-02 16:15:03 +00:00
Sascha Schumann
43ff395b65 Const'ify part of sapi_request_info. 
query_string, post_data, path_translated, request_uri, auth_user,
auth_password and argv0 are modified, so they cannot become const.
 2000-11-02 15:47:02 +00:00
Sascha Schumann
3ac8e25812 Namespace protect dir_cmds and kill some warnings 2000-11-02 15:19:54 +00:00
Sascha Schumann
1f53d0203c Restrict php_admin_value to *.conf files. 2000-11-02 15:01:25 +00:00
Zeev Suraski
a023f9280a - Fix Windows build 
- Changed the Apache .dsp to expect the Apache source code files under php_build
 2000-11-02 14:53:10 +00:00
Zeev Suraski
8c4852c2cb Fix a nasty bug in the shutdown sequence of PHP under Apache. 2000-11-02 12:05:54 +00:00
Sascha Schumann
d9ba87c84c Our context's lifetime differs from the lifetime of a filter's context, 
so don't set the filter's context in the INIT_CTX macro.
 2000-11-01 19:26:57 +00:00
Sascha Schumann
87e88d5a33 Use Input filters for handling POST data 2000-11-01 19:19:46 +00:00
Andi Gutmans
0330643ea2 - Revert patch which seems to have caused the STOP mechanism not to work. 
- I'm not quite sure why this should have caused harm even if not completey
- the right way of doing it.
 2000-11-01 11:23:52 +00:00
Zeev Suraski
0ee12a6488 Fix Apache build 2000-10-31 18:28:04 +00:00
Stanislav Malyshev
3bc3677439 Fix -d functionality 2000-10-31 16:16:57 +00:00
Sascha Schumann
4d0992bb22 Remove --with-aolserver-src directive. 
AOLserver 3.1 and up install the include directory as per suggestion.
 2000-10-30 11:44:18 +00:00
Sascha Schumann
d39c2cf0f1 POSTs work fine 2000-10-29 17:48:13 +00:00
Sascha Schumann
b07276c3e2 Add standard license 2000-10-29 17:43:23 +00:00
Sascha Schumann
af87dfe204 Unify handling of aborted connections 2000-10-29 16:14:27 +00:00
Sascha Schumann
bed7034f92 Unify aborted connection handling 2000-10-29 16:02:40 +00:00
Sascha Schumann
27a8480028 Add/unify aborted connection handling 2000-10-29 16:01:02 +00:00
Sascha Schumann
c38005a4f1 New directive AddRequestBodyFilters 
Currently it requires this patch:

http://schumann.cx/request-body-filters
 2000-10-29 15:13:23 +00:00
Sascha Schumann
f01e3fbe56 Handle user aborts 2000-10-29 15:10:49 +00:00
Sascha Schumann
86b2d4fefe Add Request Body filters. This is a much nicer concept than 
ap_get_req_body, since it is much more flexible and does not
need to buffer everything in memory (PHP still does..).
 2000-10-29 14:52:15 +00:00
Zeev Suraski
1fd09132c2 Initial steps to move the INI mechanism to the Zend engine 2000-10-29 11:38:26 +00:00
Thies C. Arntzen
825457ae64 update my email. 2000-10-29 09:14:55 +00:00
Sascha Schumann
d943274af7 POST handler for my ubercool new Apache 2.0 function ap_get_req_body. 2000-10-27 23:02:20 +00:00
Sascha Schumann
ea7534a848 use puts instead of fprintf in log handler. no need for a format string. 2000-10-27 15:40:16 +00:00
Sascha Schumann
56ccd8701d Some information about this handler 2000-10-27 15:03:53 +00:00
Sascha Schumann
b522397298 Looks like transient buckets are limited to 4096 bytes, so split up writes. 2000-10-27 13:30:41 +00:00
Sascha Schumann
93683d052b Add log message sapi handler. 
Reenable pipelining requests. Looks like the problems are caused by the
cache, not pipelining.
 2000-10-27 13:19:23 +00:00
Sascha Schumann
50500e680b Apache 2.0 does some funky internal caching which works for static 
content, but fails miserably in our context.
 2000-10-27 12:52:38 +00:00
Sascha Schumann
4f97ff0096 speling 2000-10-27 12:37:05 +00:00
Sascha Schumann
703a0c1159 Add some comments 2000-10-27 10:41:24 +00:00
Sascha Schumann
6ff371d9f7 Leave initializing of auth_(user|password) to php_handle_auth_data(). 2000-10-27 10:31:10 +00:00
Sascha Schumann
b725c6eef3 The CGI RFC allows servers to pass Authorization data to the script, 
if the server did not use the information contained therein.

See 6.1.5 and 11.2 of the proposed spec.
 2000-10-27 10:26:57 +00:00
Sascha Schumann
055efb70c3 Handle cookies and make use of php_handle_auth_data. 2000-10-27 10:19:40 +00:00
Sascha Schumann
e6dd64e96e Use php_handle_auth_data 2000-10-27 10:19:06 +00:00
Andi Gutmans
2946f87f00 - Fix new -m on Windows 2000-10-26 23:50:17 +00:00
Mathieu Kooiman
717e934a88 Added -m (Shows list of modules) to commandline.. 2000-10-26 22:31:06 +00:00
Sascha Schumann
3a263dcd99 Handle special queries. 
Apache's default handler does not seem to handle flushes correctly yet.
One more project..
 2000-10-26 21:23:20 +00:00
Sascha Schumann
d504de0f78 An Apache 2.0 Filter for PHP, completely from scratch. 
TODO:

	POST, cookies, "flushing", finalizing config framework (it works),
	http auth, PHP Hooks (apache_sub_req is there).

Note that this code depends on some other commits which are pending.
 2000-10-26 17:55:05 +00:00
Rasmus Lerdorf
bccdaff6d1 Move server_filter to an extension-specific global 2000-10-23 00:52:11 +00:00
Rasmus Lerdorf
3c92f6bb50 Output function now passes the data onto the next filter in the chain 
Clean up some variables - bb = bucket brigade, b = bucket
 2000-10-22 16:56:08 +00:00
Rasmus Lerdorf
8f494c2ad0 Code to flatten Apache 2.0 bucket brigades 2000-10-22 16:03:53 +00:00
Rasmus Lerdorf
69d704622d Woops, get rid of some crap 2000-10-22 14:05:29 +00:00
Rasmus Lerdorf
02f599ead5 The start of an Apache 2.0 module 2000-10-22 14:01:18 +00:00
Daniel Beulshausen
7883ddaf51 i'll place the reg file in the win32 folder 
cause it doesn't really fit in this folder
 2000-10-22 13:48:43 +00:00
Frank M. Kromann
878e348ff9 Adding type cast to remove compiler warning 2000-10-20 19:08:59 +00:00
Rasmus Lerdorf
c3026223f7 This appears to be the correct fix to me. 
@ Fix memory leak in x-httpd-source mode (Jason Greene)
 2000-10-14 05:06:16 +00:00
Daniel Beulshausen
c6e0cef254 trivial output change 
# someone urged me too
 2000-10-13 19:08:05 +00:00
Zeev Suraski
ce51b94461 Fix php_value issue 2000-10-13 17:07:09 +00:00
Sascha Schumann
0fd6a7ed18 Provide basic auth info to scripts. 
Protect shutdown handler from being called multiple times.
 2000-10-11 19:40:56 +00:00
Andi Gutmans
f3232e99c3 - Commit Kristian's PHP 3 patch to PHP 4. Kristian I hope it's also the 
same here.
 2000-10-11 17:48:44 +00:00
Zeev Suraski
1abd99a443 Fixed a problem that allowed users to override admin_value's and admin_flag's 2000-10-11 16:24:35 +00:00
Andi Gutmans
38423a895b - Fix request_uri to take it's value from SCRIPT_NAME if PATH_INFO is not 
defined
 2000-10-03 13:02:30 +00:00
Andi Gutmans
2622eba31d - Cleanup some output functions 2000-09-30 16:13:48 +00:00
Sascha Schumann
3be464e4ec UnixWare defines shutdown to _shutdown, which causes problems later 
on when using a structure member named shutdown. Since this source
file does not use the system call shutdown, it is safe to #undef it.

PR: #6008, #6362
 2000-09-29 19:08:17 +00:00
Daniel Beulshausen
abbfbf18bc added tsrm dir to include path, and release_ts_inline to lib path 2000-09-26 11:23:56 +00:00
Sascha Schumann
cd151feb19 #include "SAPI.h" once 2000-09-26 10:58:56 +00:00
Sascha Schumann
8ef52cabcf Cleanup 2000-09-26 10:58:42 +00:00
Ben Mansell
fd81040420 (Zeus-specific) Don't GetServerVariable() for vars which Zeus doesn't use 2000-09-19 17:43:11 +00:00
Ben Mansell
4208c264d7 Fixed bug which could truncate PHP_SELF 2000-09-19 17:34:53 +00:00
foobar
9559b88894 Fixed bug #6356. 2000-09-11 13:01:07 +00:00
Jon Parise
9a4c654606 Fix build after last commit. 2000-09-08 15:39:42 +00:00
Zeev Suraski
91c808ecc4 Restore the headers_only test to the centralized SAPI startup. If necessary, it can 
be overriden in the activate() callback.
 2000-09-08 14:43:57 +00:00
Andi Gutmans
9b1aed8323 - Add another ..\ to the TSRM search path 2000-09-08 08:17:17 +00:00
Andi Gutmans
ed8c8539df - Add TSRM to the apache workspace include path 2000-09-08 08:15:25 +00:00
Sascha Schumann
89a2e1dbdb Add TSRM include dirs 2000-09-06 15:41:40 +00:00
Zeev Suraski
4396093666 Fix ISAPI compilation 2000-09-04 20:46:46 +00:00
Andi Gutmans
570e7e9a13 - Defining TSRM_WIN32 in each and every dsp sucked. Revert this change 2000-09-02 16:28:25 +00:00
Andi Gutmans
5bc9f72e85 - More Windows build fixes 2000-09-02 16:02:53 +00:00
Sascha Schumann
e97c8ff013 Set SG(request_info).path_translated to the path of the main script. 2000-08-29 15:09:44 +00:00
Sam Ruby
4a915571f5 Add reflect.java to the list of java classes to be compiled 2000-08-29 01:42:58 +00:00
Andi Gutmans
69e2d48738 - Change spaces to tab 2000-08-28 19:31:56 +00:00
Rasmus Lerdorf
8a36eb220e Missed a couple of center attributes 2000-08-28 09:01:54 +00:00
Sascha Schumann
0b719aa462 Compute absolute path to script 2000-08-27 20:53:10 +00:00
Stig Bakken
315f4f5658 @PHP 3 regression testing framework re-born (Stig) 
Took the old PHP 3 regression testing framework and rewrote it in PHP.
Should work on both Windows and UNIX, however I have not tested it on
Windows.  See tests/README for how to write tests.  Added the PHP 3
tests and converted most of them.
 2000-08-27 19:46:06 +00:00
Sascha Schumann
c66bc46bb1 Remove obsolete note about Makefile.am 2000-08-27 10:05:23 +00:00
Sascha Schumann
c6cd319cd4 Use request_uri as PHP_SELF. decodedurl also includes the query string. 2000-08-25 10:00:48 +00:00
Sascha Schumann
5905971122 Use SAPI' register_server_variables hook. 
Defines PHP_SELF now.
 2000-08-25 09:59:38 +00:00
Sascha Schumann
ad04898e05 php_register_variables(.. ELS_CC ..) 2000-08-25 09:15:00 +00:00
Sascha Schumann
8a1db559b6 Make proper use of SAPI's register_environment functionality. 2000-08-25 08:46:32 +00:00
Daniel Beulshausen
c8eb56cc59 changed the output directorys from the windowsbuilds 2000-08-23 15:43:36 +00:00
Daniel Beulshausen
000773e7b9 little fixes 2000-08-22 15:03:38 +00:00
Sascha Schumann
bac08af4cb Disable php_value and add note about reliability 2000-08-22 07:33:27 +00:00
Sascha Schumann
2011db174b AOLserver CVS uses PREFIX. 2000-08-22 06:11:01 +00:00
Sascha Schumann
479a96ed89 Set file_handle.opened_path to NULL 2000-08-22 05:43:31 +00:00
Daniel Beulshausen
7632bca956 updated project to work with readdir.h rev.1.5 from apache cvs 2000-08-21 21:21:18 +00:00
Daniel Beulshausen
0b686eaa2a added the vs6 projectfile for the aolserver 2000-08-21 20:55:10 +00:00
Sascha Schumann
e4b2f8351e thttpd/PHP verified to run IMP 2.2.0 without any hitches. 2000-08-21 20:23:02 +00:00
Sam Ruby
b43df683ee Keep servlet working... 2000-08-21 17:01:51 +00:00
Sascha Schumann
251b83076e Move thttpd_php_init() call to httpd_initialize(). 
Otherwise, some init stuff was done twice (like resetting the
known_post_content_types hash table which caused post requests
to fail).
 2000-08-21 03:04:35 +00:00
Zeev Suraski
30ccec36b9 Fix build 2000-08-20 22:18:19 +00:00
Sascha Schumann
1d68a02df3 The status quo in PHP is that the current directory is initialized 
to the directory where the executing script is located.

Since this needs to be implemented for all SAPI modules anyway, this
change moves the functionality to php_execute_script() and gets rid
of the per-module code.
 2000-08-20 14:29:00 +00:00
Sascha Schumann
320105bcd8 Use size_t as parameter type in the getenv member of struct sapi_module 2000-08-20 14:20:21 +00:00
Sascha Schumann
67daa655f6 Execute PHP scripts everywhere (not only in the top-level directory) 2000-08-20 09:37:15 +00:00
Ben Mansell
ea98567404 REQUEST_URI is a handy server variable, lets pass it onto ISAPI/PHP 2000-08-18 14:18:57 +00:00
Sam Ruby
3aad950735 Reorder call to ELS_FETCH to be after declarations 2000-08-17 19:19:54 +00:00
Ben Mansell
8751bcb8eb (send_headers) Removed code freeing http_status_line, this is performed 
in sapi_send_headers()
# Looks like a similar problem in sapi/pi3web/pi3web_sapi.c as well.
# I can't test this though, so I'm being paranoid and not changing that code.
# Could someone please check this?
 2000-08-17 13:40:40 +00:00
Sam Ruby
d93732179b Better error reporting when dll/shared library is not able to be loaded. 
Submitted by: Bård Farstad <bf@ez.no>
 2000-08-17 10:14:50 +00:00
Stanislav Malyshev
6f8f6c521c Fix opened_path init 
# forgot to commit
 2000-08-13 18:08:01 +00:00
Stanislav Malyshev
5090b1e8d5 Fix zend_fiel_handle handling. Should fix URL include 
and various opened_path inconsistencies.
 2000-08-13 18:00:50 +00:00
Sam Ruby
5c8fca1757 Correct bug in headers only logic. 2000-08-10 06:09:05 +00:00
Zeev Suraski
4d692049b2 Fix a couple of bugs in the ISAPI module: 
- I think NTLM should work now
- Fix the DOCUMENT_ROOT code
 2000-08-09 16:45:40 +00:00
Sascha Schumann
5c62b32823 Remove some crud from diff output (Only in..). 2000-08-07 13:56:52 +00:00
Sascha Schumann
4b8823d427 Fix building thttpd SAPI module. 
This works now with thttpd 2.19.

Thanks to Andrzej Borsuk <andrzej.borsuk@alfaelektro.com.pl> for
pointing me into the right direction.
 2000-08-07 13:54:35 +00:00
Zeev Suraski
83341c39da Add DOCUMENT_ROOT 2000-08-07 11:51:21 +00:00
Stanislav Malyshev
db0872123b Fix crash on broken setups (#5979) 2000-08-05 11:28:32 +00:00
Rasmus Lerdorf
9021105c89 Fix typo 2000-08-04 16:48:42 +00:00
Rasmus Lerdorf
76a2d2538c Heads up! I have moved the headers_only and response_code checks out of 
SAPI and down into the individual SAPI modules.  I have made the
appropriate changes in all the SAPI modules, but please verify these.
The reason for this change is that Apache sometimes will feed PHP
a request_method of GET but have r->header_only set to true.  This happens
in an ErrorDocument redirect.  In this same scenario we want to preserve
the status code as well instead of just overwriting it with a 200 and
losing this information.  For now the other sapi modules act exactly as
before since they probably do not make this distinction, and they may
not even have a valid response code this early in the request.
@ Fix HEAD request bug on an Apache ErrorDocument redirect and preserve
@ the status code across the redirect as well.  (Rasmus)
 2000-08-02 22:48:45 +00:00
Rasmus Lerdorf
89107a221b Missed a symbol 2000-07-31 15:07:58 +00:00
Sam Ruby
4ca1c611b3 Refactor in support of subclassing 2000-07-30 04:50:31 +00:00
Zeev Suraski
52ff887db5 Made ob_start() and friends reentrant. It's now possible to implement this 
long-requested functionality, now that output buffering is re-entrant:

function eval_ret($code)
{
	ob_start();
	eval($code);
	$retval = ob_get_contents();
	ob_end_clean();
	return $retval;
}
 2000-07-29 14:46:09 +00:00
Hartmut Holzgraefe
1a7f851985 added '-l' option to command line / CGI version for 'syntax check only' 
plus a little cleanup and rearranging in command line option parsing

@ CGI aka. command line version has now an option '-l' for syntax check
@   without execution (Hartmut)
 2000-07-28 15:21:20 +00:00
Rasmus Lerdorf
b480b8dace Fix symbol clash which caused a DSO problem on OpenBSD 
@ Fix symbol clash which caused a DSO problem on OpenBSD (Rob Black and
@ anil@recoil.org)
 2000-07-26 20:39:59 +00:00
David Croft
0836e10a15 various version 2.0 and 2.01 licenses -> 2.02 2000-07-24 05:41:02 +00:00
Sam Ruby
54790b5e63 Correct the value of request_uri 2000-07-24 05:29:20 +00:00
Stanislav Malyshev
4c6ffdb1c2 make -c in stand-alone mode work again. 
Setting ini_path after php_module_startup doesn't do much good -
since php_module_startup reads .ini.
# This fix is very ugly. Everyone is welcome to make better fix
# that won't report errors twice and won't scan argument 3 times
 2000-07-13 09:17:39 +00:00
Sascha Schumann
e8101d4f7b Unify use of my email address 2000-07-10 10:09:15 +00:00
Sascha Schumann
06382f01fd Fix prototype of apache_child_exit_handler and remove popen-related 
preprocessor directives/macros.
 2000-07-10 09:20:35 +00:00
Thies C. Arntzen
1cee6c5b78 @- Fixed closing 2000-07-10 07:57:01 +00:00
Andreas Karajannis
59604815e1 Fixed module / global shutdown for apache. 
GSHUTDOWN functions are now executed and MSHUTDOWN functions are executed on child process exit
 2000-07-09 12:51:01 +00:00
Sam Ruby
5c13954eed Fix for JDK1.2.2/Tomcat3.2 
(can't find beanInfo for interfaces which extend other interfaces)
 2000-07-09 04:09:47 +00:00
Stanislav Malyshev
905fb8ef82 Fix #5432: should register all variables. Thanks jeroen@darius.demon.nl. 2000-07-06 17:40:18 +00:00
Rasmus Lerdorf
f2348a4826 When using HTTP auth from PHP, fill in the %u custom log field so the 
authenticated used id will get logged in the Apache access_log
@- When using HTTP auth from PHP, fill in the %u custom log field so the
@  authenticated used id will get logged in the Apache access_log (Rasmus)
 2000-07-05 18:02:42 +00:00
Sascha Schumann
e805a607cf Fix typo. A shutdown function is of course called, when the server 
exits.
 2000-07-05 11:27:24 +00:00
Sascha Schumann
16017f6d78 Change header protection macros to conform to standard. 
Draft 3 of IEEE 1003.1 200x, "2.2 The Compilation Environment"

  All identifiers that begin with an underscore and either an uppercase
  letter or another underscore are always reserved for any use by the
  implementation.
 2000-07-02 23:46:51 +00:00
Shane Caraveo
5fcf863579 fix apache dsp file 2000-07-02 17:20:03 +00:00
Shane Caraveo
712cd89434 fix nsapi dsp file 2000-07-02 17:19:49 +00:00
Rasmus Lerdorf
aa83dde27b Some user-agents send 'basic' instead of 'Basic' in their Authorization 
header.  ApacheBench is an example.  PHP's HTTP Auth would not work with
these.
Some user-agents send 'basic' instead of 'Basic' in their Authorization
header.  ApacheBench is an example.  PHP's HTTP Auth would not work with
these. (Rasmus)
 2000-06-30 17:39:21 +00:00
Sam Ruby
f72de266e2 remove unnecessary dependency 2000-06-30 14:33:46 +00:00
Zeev Suraski
37fb71b9ba Set version number on DLLs 2000-06-30 12:16:58 +00:00
Andi Gutmans
85422c3c60 - Extra newline crept in somehow 2000-06-29 13:34:58 +00:00
Andi Gutmans
1f828a6e88 - Fix problem with DICARD_PATH being defined in windows 2000-06-29 13:31:52 +00:00
Zeev Suraski
01a8f4606e I'm not sure whether this is necessary or not. Is it guarenteed that get_module_conf() 
will always return a value?  Even if there were no relevant directives at all?
 2000-06-28 18:27:13 +00:00
Sam Ruby
e216b8918e defer loading of the native code 2000-06-27 10:37:40 +00:00
Andrei Zmievski
4010b422dd Separate plain name returned by php_sapi_module() and pretty name 
used for output.
 2000-06-26 18:05:55 +00:00
Andi Gutmans
fd11a7e13e - Pray this is an OK fix for the DISCARD_PATH junk 2000-06-26 17:57:03 +00:00
Stanislav Malyshev
378440f7cf Right name for the function persist_alloc 2000-06-26 16:26:20 +00:00
Andi Gutmans
91ed009ae2 - Try two in fixing the problem with memory leaks reporting path_translated 2000-06-26 16:17:58 +00:00
Zeev Suraski
effa42696e - Fix problem with filename being freed before possible memory leaks are 
- reported by the memory manager
 2000-06-26 15:55:59 +00:00
Stanislav Malyshev
5be54abf24 If we freed it, we might not touch it 
# BTW, this is not a real fix - we still might use it
# when reporting memory leaks, but at least we won't reference
# unitialized memory
 2000-06-26 12:26:40 +00:00
Zeev Suraski
cb5891d277 Apply the NSAPI patch 2000-06-24 16:31:10 +00:00
Sascha Schumann
0c03253635 Stop including dl/phpdl.h. 2000-06-24 15:36:04 +00:00
Sascha Schumann
ee5e330bcf alloc.h has been removed from the Apache 1.3 CVS tree 2000-06-24 11:39:37 +00:00
Holger Zimmermann
fce46168d1 Changed strtok_r to php_strtok_r 2000-06-18 19:01:54 +00:00
Sascha Schumann
80a05cd78c Cosmetic cleanups 2000-06-18 15:30:55 +00:00
Sascha Schumann
8975f1dceb Readd pi3web_sapi.c and reset flags. 2000-06-18 10:21:20 +00:00
Holger Zimmermann
da132274a4 Added Pi3Web support 2000-06-17 12:06:09 +00:00
Hartmut Holzgraefe
5d6516be86 look for apxs in /usr/sbin (that's where SUSE puts it) 
if no path is given and apxs is not found in $PATH
 2000-06-17 06:22:40 +00:00
Hartmut Holzgraefe
87a491d7b6 C++ // comments are evil ... 2000-06-16 18:24:02 +00:00
Sascha Schumann
8f8889d02d More main work 2000-06-16 11:07:13 +00:00
Andi Gutmans
2987d5216e - More #if WIN32|WINNT -> #ifdef PHP_WIN32 conversions 2000-06-15 23:45:05 +00:00
Andi Gutmans
17ce56825d - Beautify a bit 2000-06-15 22:46:17 +00:00