clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-06 09:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,270 Commits 494 Branches 1,367 Tags 822 MiB
1e48f66729
Commit Graph

974 Commits

Author SHA1 Message Date
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