Commit Graph

471 Commits

Author SHA1 Message Date
Dmitry Stogov
94004da0ed Fixed bug #37256 (php-fastcgi dosen't handle connection abort) 2006-05-24 09:41:55 +00:00
Dmitry Stogov
0f9c8e550e Fixed bug #37341 ($_SERVER in included file is shortened to two entries, if $_ENV gets used). 2006-05-24 07:52:58 +00:00
Dmitry Stogov
dbf6f9b81c Fixed bug #37496 (FastCGI output buffer overrun) 2006-05-22 09:23:01 +00:00
Antony Dovgal
0e5ce38c04 fix typo 2006-05-22 06:49:44 +00:00
Dmitry Stogov
c0c388832c - Removed source compatibility with libfcgi
- Optimized access to FastCGI environment using HashTable instead of linear sear
ch
- Allowed PHP_FCGI_MAX_REQUESTS=0 to disable PHP die
- Allowed PHP_FCGI_CHILDREN=0 to disable PHP spawn workers
2006-05-15 14:30:50 +00:00
Ilia Alshanetsky
2721311863 MFB: Fixed bug #37376 (fastcgi.c compile fail with gcc 2.95.4). 2006-05-09 22:00:36 +00:00
Dmitry Stogov
27fe3ef1e7 Fixed bug #37313 (sigemptyset() used without including <signal.h>). (jdolecek) 2006-05-05 07:05:59 +00:00
Antony Dovgal
8ab0e121d4 plug leak 2006-05-03 19:40:49 +00:00
Dmitry Stogov
d958c27fca Fixed bug #37205 (incompatibility with mod_fastcgi) 2006-05-03 15:48:33 +00:00
Dmitry Stogov
0f489f738c Fixed incompatibility with isapi_fcgi.dll 2006-05-03 13:20:12 +00:00
Dmitry Stogov
f9a6119214 Proper fix for bug #37205 2006-04-27 11:39:46 +00:00
Dmitry Stogov
3bc7017543 Revert wrong fix 2006-04-26 17:48:45 +00:00
Dmitry Stogov
8fbff809bd Fixed bug #37205 (Serving binary content/images fails with "comm with server aborted" FastCGI err) 2006-04-26 11:08:23 +00:00
Dmitry Stogov
09d628c62d Fixed compilation on Solaris 2006-04-24 09:56:56 +00:00
Dmitry Stogov
4c583d6f73 Fixed SUN_LEN calculation 2006-04-18 06:59:31 +00:00
Dmitry Stogov
83657db8ff Fixed memory leaks 2006-04-18 06:58:54 +00:00
Dmitry Stogov
f3c00034b6 CGI anf FastCGI assume $_SERVER and $_ENV have the same values,
so we don't need construct the same arrays twich and may just copy it
2006-04-07 13:45:51 +00:00
Dmitry Stogov
3ada78d408 Removed unnecessary copying 2006-04-07 12:39:28 +00:00
Dmitry Stogov
4b09d37f66 MTH: Allowed '-b' with UNIX sockets 2006-03-23 10:20:14 +00:00
Dmitry Stogov
34c493ea07 Unicode support for dl() patch. 2006-03-17 13:45:43 +00:00
Dmitry Stogov
f584e957ac Optimized FastCGI SAPI check. Check for ini options only once. 2006-03-17 09:32:47 +00:00
Dmitry Stogov
86780519d4 Disabled dl(). Now it is enabled only when a SAPI layer registers it explicitly. Only CLI, CGI and EMBED do this. 2006-03-16 16:53:10 +00:00
Pierre Joye
bb1ec86f9d - remove magic_quotes_gpc, magic_quotes_runtime, magic_quotes_sybase
(calling ini_set('magic_....') returns 0|false
- get_magic_quotes_gpc, get_magic_quotes_runtime are kept but always return false
- set_magic_quotes_runtime raises an E_CORE_ERROR
2006-03-08 00:43:32 +00:00
Alex Waugh
b7d6d705f1 Fix for RISC OS 2006-03-07 22:37:18 +00:00
Dmitry Stogov
09ca61c125 Made server wide switch for unicode on/off (according to PDM). 2006-02-13 10:23:59 +00:00
Frank M. Kromann
322be18f4d MFB51 Fix build on win32 2006-02-04 23:58:22 +00:00
Dmitry Stogov
47e607a93a Fixed bug #36158 (SIGTERM is not handled correctly when running as a FastCGI server) 2006-02-03 16:30:27 +00:00
Dmitry Stogov
ed3a54c657 AIX support 2006-02-02 10:00:09 +00:00
foobar
713127f5ee Nuke unused files 2006-01-06 21:19:16 +00:00
foobar
7c10d88716 credits for Dmitry 2006-01-06 21:17:14 +00:00
foobar
251c5173fd bump year and license version 2006-01-01 13:10:10 +00:00
Antony Dovgal
4eef9b47e2 fix CGI build (patch by Pierangelo Masarati) 2005-12-29 14:12:34 +00:00
Dmitry Stogov
fbc0843fd4 Code cleanup (Nuno) 2005-12-26 10:54:12 +00:00
Sebastian Bergmann
3f47db3c89 Fix Windows build. 2005-12-26 07:56:37 +00:00
Zeev Suraski
c4caff6bc4 Commit missing files - sorry! 2005-12-26 07:25:45 +00:00
Zeev Suraski
91a735502c Reimplement FastCGI interface
Due to licensing restrictions that actually don't allow anybody to use
the libfcgi code without prior approval from Open Market, which is
impossible to obtain - we decided to reimplement this interface from
scratch.  The result is actually slightly faster, and more importantly,
clear of any copyright issues.

Implementation by Dmitry
2005-12-25 12:45:01 +00:00
Dmitry Stogov
34bc5d7d41 Bug #34429 (Output buffering cannot be turned off with FastCGI) 2005-12-09 16:58:02 +00:00
foobar
0586ac73f1 - fix possible compile error 2005-12-03 01:27:37 +00:00
Dmitry Stogov
ef47ee6e13 Cleaned CGI code. Now FastCGI can not be disabled. See into sapi/cgi/CHANGES for more details. 2005-11-23 18:08:51 +00:00
Michael Wallner
ab95f1981c - sapi_header_op(SAPI_HEADER_(REPLACE|ADD), {NULL, 0, 0}) caused HTTP response splitting
- sapi_send_headers() already takes care of default_content_type (left over of fix for bug #29983)
2005-11-02 14:27:02 +00:00
Johannes Schlüter
7e85bac9ec - Fix #34557 php -m exits with "error" 1 2005-10-06 20:29:13 +00:00
foobar
20241fe16a - 2004 -> 2005 2005-08-03 11:12:19 +00:00
Dmitry Stogov
8de3367453 Fixed support for shared extensions on AIX 2005-07-07 05:54:43 +00:00
Wez Furlong
43aa6922d3 Don't crash here if there are errors (such as failing to load extensions via
php.ini) during startup.
2005-06-16 14:54:51 +00:00
foobar
51eebc6096 cs + ws 2005-06-03 23:11:51 +00:00
foobar
a20383ba06 - Unify the "configure --help" texts 2005-05-29 23:17:16 +00:00
foobar
8c2cda1251 int != long 2005-04-28 14:23:57 +00:00
foobar
03bdd1a5d4 - Added fastcgi.logging php.ini option to be able to disable
logging through the fastcgi connection
2005-04-28 13:14:26 +00:00
foobar
9af93dbb41 Expose EXEEXT and use for cli/cgi binaries 2005-04-21 14:57:53 +00:00
Rasmus Lerdorf
3c0411c496 Fix for bug #32263
This adds proto_num to request_info.  It is defaulted to HTTP 1.0 (1000)
such that it has a valid value even if the underlying sapi doesn't set it
correctly.  It is then used to determine if a 302 or a 303 should be sent
on a Location redirect.  Any non GET/HEAD HTTP 1.1 redirect will get a 303
instead of a 302 to be compatible with the HTTP spec.
2005-03-14 19:25:39 +00:00
foobar
84e560435e MFB: Fix VPATH build 2005-03-06 23:16:44 +00:00
foobar
59db0751fc Revert previous patch 2005-02-11 02:03:51 +00:00
foobar
951eb23e9a - Fixed bug #28227 (PHP CGI depends upon non-standard SCRIPT_FILENAME)
# patch by: lukem at NetBSD dot org
2005-02-04 10:39:33 +00:00
foobar
376d5f6910 Fix ZTS build 2005-01-11 13:35:56 +00:00
foobar
40b9c63da1 - Fixed bug #28074 (FastCGI: stderr should be written in a FCGI stderr stream). 2005-01-10 15:38:24 +00:00
foobar
a139dbf9cc - Fix outside-source-tree builds. Always include generated header files
with #include <some_header.h> to make sure the correct file is used.
2005-01-09 21:05:06 +00:00
foobar
69eec3f3b9 MFB_4_3: Quote macro names in AC_DEFUN() 2004-12-30 07:08:39 +00:00
Rasmus Lerdorf
fdaa130f3a Add the new request_time sapi struct entry to all the sapis. Some of these
may have ways of getting the request time without the extra syscall, but
for now let's just make sure we don't crash and people will eventually
fill these in where applicable.
2004-12-20 19:33:41 +00:00
Edin Kadribasic
546e5bbc43 Made php -m output sorted case-insensitevly 2004-07-14 22:30:29 +00:00
Sascha Schumann
f51ff68dfa - revert to proper behaviour 2004-07-05 11:41:31 +00:00
Stanislav Malyshev
74ab20817a Fix fastCGI breakage: due to calling flush on unitialized requests,
request was aborted unless ignore_user_abort is set
2004-05-06 15:23:53 +00:00
Ilia Alshanetsky
39a43c994e Fixed bug #27802 (default number of children to 8 when PHP_FCGI_CHILDREN is
not defined).
2004-03-31 17:01:01 +00:00
Ilia Alshanetsky
ed2b1770ab Invalid response code when force-cgi-redirect safety mechanism is triggered 2004-03-12 14:05:59 +00:00
Rasmus Lerdorf
2a44432e8c As discussed a while ago. There is no reason to disallow command-line
arguments for the cgi version when run in a cgi context.  Our own test
framework is in fact broken because of this unnecessary restriction.
2004-02-27 23:31:28 +00:00
Marcus Boerger
1c00296cc7 Bugfix #27104 CLI/CGI SAPI module variable name conflict 2004-02-11 21:00:46 +00:00
Ilia Alshanetsky
c6a2a19051 Proper win32 fix. 2004-02-11 14:52:12 +00:00
Ilia Alshanetsky
9c1be88844 Fixed win32 build.
Fixed building of libfcgi when PHP is built from another directory.
Added missing headers needed for wait().
Removed duplicate signal.h header.
Removed unneeded variables.
2004-02-10 17:44:31 +00:00
Ilia Alshanetsky
242296faeb Fixed bug #26758 (FastCGI exits immediately with status 255). 2004-02-10 00:29:46 +00:00
Ilia Alshanetsky
0f9d01d8ac Fixed bug #27026 (Added cgi.nph that allows forcing of the Status: 200
header that is not normally needed).
2004-02-10 00:02:38 +00:00
foobar
f4983c0d3f - Renamed all *php4* files to *php5*, changed all php4/PHP4 to php5/PHP5 2004-01-17 13:00:38 +00:00
foobar
ccfc46b0aa - Happy new year and PHP 5 for rest of the files too..
# Should the LICENSE and Zend/LICENSE dates be updated too?
2004-01-08 17:33:29 +00:00
Wez Furlong
7b40de6fd0 fix fastcgi build 2004-01-08 10:56:39 +00:00
Andi Gutmans
dbeb4158d2 - A belated happy holidays and PHP 5 2004-01-08 08:18:22 +00:00
Stanislav Malyshev
facea7fb70 fix potential buffer overrun 2003-12-07 12:59:54 +00:00
Wez Furlong
05b9b20ed8 Add new (optional!) win32 build infrastructure.
Will follow up to internals@ shortly.
2003-12-02 23:17:04 +00:00
foobar
e01ab8c9cf - Made --program-prefix and --program-suffix work. (See bug #23030) 2003-12-01 15:17:13 +00:00
Edin Kadribasic
45f12cc61f Windows compile fix (patch by sfox@php.net). 2003-11-13 10:32:05 +00:00
foobar
b4c05a5068 MFB 2003-10-31 01:29:59 +00:00
Ilia Alshanetsky
4c4d5a02b9 Fixed formatting issues (patch by: Joe Orton) 2003-10-17 02:21:27 +00:00
foobar
db50cd251e Aligned configure help texts. 2003-10-03 05:24:33 +00:00
foobar
ca18b631fd - Should fix some CLI build problems on some systems. 2003-09-08 13:10:10 +00:00
Sascha Schumann
dcd0b8fc90 Update documentation, -b ip:port works 2003-09-03 08:24:37 +00:00
Sascha Schumann
45a928ef94 fix heuristic: if someone passed "-b IP:port", this check would
falsely recognize the parameter as defining only a port.
2003-09-03 08:15:09 +00:00
Marcus Boerger
cbb011da2d Fix interactive mode 2003-08-17 18:36:27 +00:00
Ilia Alshanetsky
f6290bfbfd Don't forget to flush() buffers for -w -s 2003-08-13 02:01:46 +00:00
Sascha Schumann
f622240a0e MFB don't overwrite 2003-08-04 19:05:20 +00:00
Ilia Alshanetsky
3253746c26 Preserve exit status for non-php execution modes. 2003-08-01 16:52:49 +00:00
Ilia Alshanetsky
68616d764c Fixed bug #23509 (exit code lost when exit() called from
register_shutdown_function())
2003-08-01 12:26:28 +00:00
foobar
eb8c8f94a9 *** empty log message *** 2003-07-02 02:38:47 +00:00
Sascha Schumann
1b50ca4df6 Fix install-sapi dependency - it should depend on OVERALL_TARGET, of course. 2003-07-02 01:08:26 +00:00
foobar
e5af63a7d5 - Separate CGI build from regular SAPI build
# Creating the libphp5.a lib is not necessary for CGI build.
#
# btw. It would be quite easy to build CGI, CLI and for example Apache SAPI
# the same time.. :)
2003-07-01 17:01:21 +00:00
Shane Caraveo
42165c12b0 renable -b option (removed when longopts were added)
dissable -b on windows due to fastcgi lib bug
close stdin on linux when using socket server (bug 23664)
2003-06-29 20:45:38 +00:00
Shane Caraveo
97ffab21a6 fix bug http://bugs.php.net/bug.php?id=24009
also do not use APPL_PHYSICAL_PATH as DOCUMENT_ROOT under IIS, it's
different depending on IIS configuration.  Code works fine without it, that
was just an attempt at a shortcut.
2003-06-29 20:09:36 +00:00
James Cox
f68c7ff249 updating license information in the headers. 2003-06-10 20:04:29 +00:00
Edin Kadribasic
b7713f411e Fix for #23902 by Shane.
Removed bogus recommendation from php.ini files.

# Basic authentication is actually possible
# usign IIS + PHP cgi countrary to our current docs
2003-06-03 10:06:45 +00:00
Moriyoshi Koizumi
aa50e817ae CGI SAPI should honour this setting 2003-05-30 22:31:12 +00:00
Derick Rethans
814f793035 - MFB: Version output beautification 2003-05-30 16:10:58 +00:00
foobar
61e09677b2 MFB: nuked php_header() call from the sapi_cgi_log_message() 2003-05-26 23:22:05 +00:00
Shane Caraveo
ce91e18377 http://bugs.php.net/bug.php?id=14409
move from PHP_4_3
2003-05-26 00:46:24 +00:00
Shane Caraveo
92dfadb1e0 continuation on bugfix #13757
make argv/argc *and* query_string work correctly when running cgi in shell
2003-05-19 06:46:19 +00:00
Shane Caraveo
57f01b14e9 bugfix #13757 - passing query string on command line when run from shell 2003-05-19 03:40:33 +00:00
Moriyoshi Koizumi
bb1720a9d7 Fixed bug #23669 2003-05-17 18:47:17 +00:00
Moriyoshi Koizumi
db2de468e1 Fixed too optimized part 2003-03-29 16:18:04 +00:00
Moriyoshi Koizumi
8e8029f23d CS & WS fixes 2003-03-29 16:13:51 +00:00
Moriyoshi Koizumi
2ad3f446c3 Do the right fix.. 2003-03-28 18:24:02 +00:00
Moriyoshi Koizumi
0b6f629b68 Fixed bug #22773 2003-03-28 17:53:36 +00:00
Shane Caraveo
e949850881 handle invalid paths passed to us from iis 2003-03-27 17:52:33 +00:00
Sebastian Bergmann
5ca078779a Eliminate some TSRMLS_FETCH() calls. Tested with Win32 build of SAPI/CGI and SAPI/CLI on Win32. 2003-03-25 08:07:13 +00:00
Shane Caraveo
56210b8921 use the correct flush on deactivate
add some code to make debugging iis 5 cgi easier
2003-03-25 07:43:30 +00:00
Shane Caraveo
ac7748cef1 For fastcgi env vars, don't magic quote them 2003-03-23 20:16:41 +00:00
Stig Bakken
0e6fca4f22 * email address change 2003-03-18 12:06:09 +00:00
Ben Mansell
6d8283fa57 Fix bug whereby a webserver closing stdout from the CGI/FastCGI binary
would cause PHP to get caught in an infinite loop of failing write()
syscalls.
2003-03-07 14:48:28 +00:00
Ben Mansell
64bb5135d9 C++ -> C comments 2003-03-05 15:01:13 +00:00
foobar
406340713d MFB: Fixed bug #22356 (Do not add empty -I flags). 2003-02-23 09:37:13 +00:00
Zeev Suraski
4934744b93 Win32 build improvements 2003-02-17 13:29:59 +00:00
Shane Caraveo
8c73b6ab70 prevent possible crash if used in combo with mod_gzip
fix command line
2003-02-17 03:39:58 +00:00
Marcus Boerger
d4fd1c07b1 - Allow long option names
- Update CLI's manpage

@Added support for long options in CLI & CGI (e.g. --version). (Marcus)

# In contrast to the preliminary patch this should work now completely.
# If all long option names are accepted we may even think about MFHing.
2003-02-16 01:23:11 +00:00
foobar
92279e5e06 MFB 2003-02-14 14:38:20 +00:00
Marcus Boerger
aa8dfa0b74 fix non FCGI build 2003-02-13 19:46:40 +00:00
Shane Caraveo
a13ef6ec42 There is *absolutely no* definitive way to know if argv0 is the
actual php script, or if it is the beginning of a query string.
Additionaly, passing parameters on the command line is
not part of CGI spec, and is not required by either
Apache or IIS.  So I have removed that code altogether,
and done some further cleanup.  Also fix pre4.3 behaviour if fix_pathinfo=0.
I've tested with IIS and Apache 1.3.27 on w2k and RH 7.3.
2003-02-13 18:21:12 +00:00
Shane Caraveo
1a4c82e014 fix bug 21261
putenv on some platforms requires we provide the memory
    cleanup env parsing logic
fix bug 21367
    missed optargs in a previous patch
2003-01-25 22:01:53 +00:00
Ilia Alshanetsky
5de9962d50 Fixed bug #21297. The fix also fixes miscalculation of lines numbers by 1
due the previously mentioned bug.
2003-01-08 00:41:53 +00:00
Zeev Suraski
6591b9c826 Add missing call 2003-01-07 16:33:28 +00:00
Zeev Suraski
19d47d9f6e Initialize lineno using the new infrastructure 2003-01-05 16:10:35 +00:00
Sebastian Bergmann
2c5d4b8c23 Bump year. 2002-12-31 15:59:15 +00:00
George Schlossnagle
190867c800 fixed ws 2002-12-25 21:18:37 +00:00
George Schlossnagle
abbf745211 fix for 21177 2002-12-25 20:38:37 +00:00
Stefan Esser
66ebbb5ae1 fix compile warning 2002-12-24 23:46:17 +00:00
Edin Kadribasic
d29309eb68 MFB:
Making build system changes according to proposal:
http://news.php.net/article.php?group=php.dev&article=92682
2002-12-19 17:02:40 +00:00
Melvyn Sopacua
2421e79b60 Fix make install target on Cygwin, bug #20807 2002-12-09 17:02:38 +00:00
Shane Caraveo
76e09401ab aparently did not add these on head
removed ssize_t which was causing problems, and not in libfcgi anyway
2002-12-02 05:24:54 +00:00
Shane Caraveo
75cbbfacb1 fix use of Alias under apache by defaulting script_name to redirect_url
dont lstat, stat.
2002-12-02 02:16:38 +00:00
Shane Caraveo
9bc3f72d8e build support for cgi fixes previously commited 2002-12-01 21:50:35 +00:00
Shane Caraveo
a3bd39429c Fix CGI to match cgi spec.
This patch properly fixes support for CGI in PHP.  For backwards compatible
broken behaviour, cgi.fix_pathinfo can be set to zero in php.ini.
CGI failed to work under apache at all, either using the cgi-script directive
or as a ScriptAlias setup. Typicaly it would try to parse itself.  This will
still happen if you dissable fix_pathinfo, and set DISCARD_PATH.
This also fixes PATH_INFO, and finally we can run pres2 under cgi or fastcgi.
This patch has been tested under Apache 1.3, 2.0, IIS, as both cgi and fastcgi,
on Windows and OSX.  A followup patch with build stuff for linux will follow.
2002-12-01 21:37:14 +00:00
foobar
dd53efc196 - Made the STANDARD_SAPI_MODULE_PROPERTIES be what it says it is. 2002-11-26 05:57:06 +00:00
Shane Caraveo
95b4045f48 configure now supports building the cgi-fcgi module
configure --enable-fastcgi
2002-11-26 05:51:16 +00:00
Edin Kadribasic
81711ba621 Avoid possible buffer overflow. 2002-11-22 15:47:39 +00:00
Edin Kadribasic
fd47c5bb32 MFB: Don't send default http status (200). 2002-11-22 13:55:27 +00:00
Edin Kadribasic
714a5be6cc Fixed bug #19207 by adding cgi.rfc2616_headers configuration directive. 2002-11-22 10:15:47 +00:00
Andrei Zmievski
ca332dfc96 Oops. 2002-11-15 00:32:42 +00:00
Andrei Zmievski
3e8a800a96 Fix function prototype. 2002-11-15 00:31:10 +00:00
Andrei Zmievski
e09d62c435 Sort the modules and extensions before printing them when -m switch is used. 2002-11-14 20:32:28 +00:00
Marcus Boerger
cecb9dfc79 Implemented -n switch to skip parsing ini at startup as suggested by Wez.
#The switch 'n' was planned to be used for beautifying....delete n to make
#clear these functions do not have a switch yet.
2002-11-12 20:56:47 +00:00
Hartmut Holzgraefe
cb6202bbe8 reverting accidential commit 2002-11-12 16:41:14 +00:00
Hartmut Holzgraefe
0c395d0f4c *** empty log message *** 2002-11-12 16:37:47 +00:00
Ilia Alshanetsky
64f77577f0 Fixed bug #20035. ZE now allows us to pass the current line position by
setting zend_lineno to (current_line * -1).
2002-11-05 22:04:12 +00:00
Derick Rethans
d82565fb7a - Fix build
#- Jan, please TEST! before committing :-)
2002-10-25 14:33:46 +00:00
Jan Lehnardt
ed29169f91 - alphabetcial output for php -h (cgi)
- cosmetics
2002-10-25 09:28:55 +00:00
Sascha Schumann
2909e5c9c9 centralize #include "build-defs.h" and drop (sometimes inconsistent) other
instances
2002-10-24 13:15:49 +00:00
foobar
9d21dd450d - Moved CGI specific lines from configure.in to sapi/cgi/config9.m4
which is 'executed' last of the SAPI config.m4's.
- Added --disable-cgi option. (was possible only with above change)
- Made the sed check to not test for the possibly working sed on Solaris
  since that would make the test quite useless. (compile would still fail)

# That sed check is not enabled yet..need to know whether we fail
# during configure or just put out a warning about possible non-working
# sed. As even plain ./configure doesn't work in most cases, I think
# it would be better to just fail during configure and let the users
# fix their paths/install GNU sed.
2002-10-21 03:12:27 +00:00