Commit Graph

883 Commits

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