Commit Graph

1866 Commits

Author SHA1 Message Date
Nuno Lopes
2320354d66 MFB: more int->zend_bool conversions 2006-09-06 11:55:12 +00:00
Dmitry Stogov
df23e559b5 Fixed "signed/unsigned mismatch" warning 2006-09-04 07:27:50 +00:00
Dmitry Stogov
b94fb5e09c FastCGI environment variables must not be overriden by system environment variables 2006-08-31 13:12:18 +00:00
Dmitry Stogov
fcb9e3bc28 Fixed bug #38543 (shutdown_executor() may segfault when memory_limit is too low). 2006-08-22 12:05:10 +00:00
Sascha Schumann
3582e2f132 "sa_len" is defined to "sa_union . sa_generic . sa_len2" on IRIX,
so we use another variable name here.
2006-08-20 17:44:06 +00:00
Antony Dovgal
3cf1565d90 typos in comments and other minor improvements 2006-08-10 13:44:00 +00:00
Antony Dovgal
dbe2092313 implement zend_unicode_to_string() and zend_string_to_unicode()
part #2 (of 2)
2006-08-08 16:59:11 +00:00
Stanislav Malyshev
a9a858d7ad fix bug with variables clobbered by longjmp 2006-08-08 13:12:37 +00:00
Dmitry Stogov
c6fdecc906 Added "PHPINIDir" Apache directive to apache and apache_hooks SAPIs 2006-08-03 09:57:05 +00:00
Antony Dovgal
cdb628d67d nuke unused variable 2006-07-26 10:30:45 +00:00
Michael Wallner
29438e890a - fix TS issue found by Jani 2006-07-25 20:22:28 +00:00
Dmitry Stogov
61d39cf1c1 Changed memory_get_usage() and memory_get_peak_usage(). Optional boolean argument allows get memory size allocated by emalloc() (by default) or real size of memory allocated from system. 2006-07-25 13:41:08 +00:00
Dmitry Stogov
b0e3dfab13 Documentation fix 2006-07-24 12:15:29 +00:00
Dmitry Stogov
6687f0377b New memory manager 2006-07-18 09:08:06 +00:00
Ilia Alshanetsky
bb9a727682 MFB: apache2handler sapi is no longer experimental 2006-07-11 00:15:44 +00:00
Edin Kadribasic
66790e727a Added windows build support for apach2filter, supporting apache 2.0.x and 2.2.x 2006-07-05 10:12:42 +00:00
Antony Dovgal
5c06523d75 fix #37920 (compilation problems on z/OS) 2006-06-27 08:26:54 +00:00
Hannes Magnusson
9f96f0340b Argument info 2006-06-25 19:17:20 +00:00
Antony Dovgal
737e1bdd92 initialize pointers 2006-06-20 13:01:08 +00:00
Antony Dovgal
d6669ef575 plug leak in CGI SAPI when running scripts with query string in console 2006-06-19 17:49:20 +00:00
Michael Wallner
dbfa7271c8 MFB52: Fix Bug #37780 memory leak trying to execute a non existing file (CLI) 2006-06-19 14:53:03 +00:00
Antony Dovgal
cb68193690 add missing ifdef and avoid "unused variable" warning 2006-06-19 11:38:51 +00:00
Nuno Lopes
f1d78f433d MFB 2006-06-17 11:14:21 +00:00
Dmitry Stogov
e901a7a870 Removed warnings 2006-06-13 14:22:27 +00:00
Dmitry Stogov
cd54f8ef04 Removed warning 2006-06-13 13:55:32 +00:00
Michael Wallner
40ac3637c2 - sync with apache2handler 2006-06-09 16:29:25 +00:00
Michael Wallner
d6b04eb53e - fix bug #37720 (merge_php_config scrambles values) 2006-06-09 15:13:12 +00:00
Johannes Schlüter
9c5fdd1b7f - Removed useless -g command line option from CGI and CLI
- Fixed conflicting behaviour if -B and -a are set with CLI
- Fixed handling of auto_prepend and exceptions in readline-a-mode
2006-06-03 22:00:30 +00:00
Michael Wallner
231ad17475 - explicit usage of TS macros
# this could have been raised a lot earlier
2006-06-03 11:19:44 +00:00
Michael Wallner
4ce0141713 - new output control code
# scan README.NEW-OUTPUT-API to get a grasp
# tree has been tagged with BEFORE_NEW_OUTPUT_API
#
# TODO:
#  - improve existing output handlers
#  - move zlib.output_compression cruft from SAPI.c to zlib.c
#  - output_encoding handling was ambigious, resp. is undefined yet
#  - more tests
2006-06-02 19:51:43 +00:00
Michael Wallner
04766b7933 - call ap_set_content_type() only once, else each time we call it,
configured output filters for that content type will be added
2006-05-28 20:31:15 +00:00
Dmitry Stogov
c6256d890a Fixed bug #37496 (FastCGI output buffer overrun) 2006-05-25 06:40:47 +00:00
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
Rasmus Lerdorf
9b985490f6 We might want to consider moving this to a long throughout the sapi code,
but for now switch to a signed int.
2006-05-13 21:48:14 +00:00
Dmitry Stogov
b75a22b203 Fixed bug #37306 (max_execution_time = max_input_time). 2006-05-11 22:08:55 +00:00
Rasmus Lerdorf
839c3e24a3 MFB input filter hook for getenv() 2006-05-10 21:25:01 +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
Edin Kadribasic
75af4d3bb5 MFB: Enable parallel build against Apache 2.2 libs and headers 2006-05-07 00:10:06 +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
Uwe Schindler
c9156346eb Remove hiding of authorization headers completely because safe mode canceled 2006-04-29 21:50:17 +00:00
Frank M. Kromann
954199c9fb More ZSTR() fixes 2006-04-29 14:53:26 +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
Edin Kadribasic
80ac536d13 MFB: Correctly import external data (#33292) 2006-04-26 09:32:11 +00:00
Dmitry Stogov
09d628c62d Fixed compilation on Solaris 2006-04-24 09:56:56 +00:00
Andrei Zmievski
a4cea91d01 MFB 2006-04-23 19:57:40 +00:00
Frank M. Kromann
1791befa0c Fix Win32 build. NULL_ZSTR was converted to ZSTR(NULL_ZSTR) 2006-04-22 10:39:31 +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
Ilia Alshanetsky
ae08857016 Removed extra space in the Content-Type header for logos
Simplified stderr error reporting in apache sapi.
2006-04-02 17:58:07 +00:00
Dmitry Stogov
4b09d37f66 MTH: Allowed '-b' with UNIX sockets 2006-03-23 10:20:14 +00:00
Michael Wallner
1251f42585 MFB: fix php_apache_sapi_header_handler() modifying sapi_header 2006-03-19 14:58:06 +00:00
Andrei Zmievski
a75b8f5f35 Fix compiler errors by using NULL_ZSTR where zstr is expected.
# I guess we need to use NULL_ZSTR instead of NULL when passing NULL to
# functions that expect zstr parameter.
2006-03-17 22:52:55 +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
Alex Waugh
ad777e3c78 Improve DOCUMENT_ROOT setting 2006-03-07 22:34:37 +00:00
Ilia Alshanetsky
87c4a01b87 Nuke safe_mode from sapi/*
# only main/ remains at this point, this is the next step
2006-03-07 14:43:16 +00:00
Pierre Joye
303bfea78f - remove register_globals support (aka "Kill the f***ing thing" :) 2006-03-07 00:20:54 +00:00
Dmitry Stogov
6f7619cf6f Unicode support: zstr union 2006-03-01 16:27:47 +00:00
Johannes Schlüter
14e07c9ae2 - List --rf/--rc/--re only with enabled reflection 2006-02-21 21:14:36 +00:00
Johannes Schlüter
851e5109f6 - Fix build with readline-support 2006-02-21 21:04:19 +00:00
Dmitry Stogov
0f1209ab3d Portable unicode string API:
- use the same type (int) for zval.value.usr.len and zval.value.str.len
  - use union "zstr" as char*/UChar* mixture instead of void*
  - Z_UNISTR() and Z_UNILEN() no longer check for Z_TYPE()
  - nuke int32_t from ZE (not finisned)
2006-02-21 20:12:43 +00:00
Antony Dovgal
46882d6782 MF51: fix memory leak and possible invalid reads 2006-02-15 11:16:30 +00:00
Antony Dovgal
eb49217161 fix #36400 (Custom 5xx error does not return correct HTTP response error code) 2006-02-15 11:07:33 +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
George Wang
18d36265fd Initial checkin of LiteSpeed SAPI module 2006-01-13 03:21:51 +00:00
Marcus Boerger
34c8cd0190 - Show whether this is the shell or just the starnge mode 2006-01-07 16:46:30 +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
Rasmus Lerdorf
4930c2fa31 Let's not mess with r->allowed here - this should fix bug #32561 2006-01-06 17:54:35 +00:00
Ilia Alshanetsky
e7e0bef106 MFB51: Added param checks for ap2 fetch respose/request header functions. 2006-01-03 20:13:31 +00:00
foobar
22a3bedee0 - Fixed apache_setenv() which requires 2 parameters 2006-01-02 22:39:43 +00:00
Ilia Alshanetsky
331253e7e6 MFB51: Fixed possible crash in apache_getenv()/apache_setenv() on invalid
parameters.
2006-01-02 22:19:53 +00:00
Ilia Alshanetsky
14b8cbedb7 MFB51: Added safety checks 2006-01-01 20:13:31 +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
Sara Golemon
e047e8133d Silence compiler warning: unused variable 2005-12-29 06:00:36 +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
Antony Dovgal
ddf87742ec change -o to || to be more portable 2005-12-22 11:02:51 +00:00
Andrei Zmievski
14df4af00e I see no reason no reason to not support chunked encoding requests.
Let's ask Apache to decode these requests for us.
2005-12-15 00:27:25 +00:00
Ilia Alshanetsky
9defb1298e MFB51: Fixed bug #35571 (Fixed crash in Apache 2 SAPI when more then one php
script is loaded via SSI include). (Ilia)
2005-12-14 03:36:58 +00:00
Marcus Boerger
6f2a00690b - Add method support to --rfunction 2005-12-11 02:40:49 +00:00
Marcus Boerger
4258bc6f26 - Add docu 2005-12-11 02:16:24 +00:00
Marcus Boerger
9662ba59c4 - Rewrite --r* and add --rfunction 2005-12-10 13:43:51 +00:00
Dmitry Stogov
34bc5d7d41 Bug #34429 (Output buffering cannot be turned off with FastCGI) 2005-12-09 16:58:02 +00:00
foobar
a208d9a966 - Nuke php3 legacy 2005-12-06 02:28:26 +00:00
foobar
5ee664f80e nuke php3 legacy 2005-12-06 01:13:59 +00:00
foobar
becbb993a1 nuke php3 legacy 2005-12-06 01:08:40 +00:00
foobar
89199c43b2 - Nuke non-working part 2005-12-04 23:31:33 +00:00
foobar
0586ac73f1 - fix possible compile error 2005-12-03 01:27:37 +00:00
foobar
3cdf23b830 - Fixed bug #35409 (undefined reference to 'rl_completion_matches') 2005-11-28 16:49:35 +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
Ilia Alshanetsky
85fb03cbae MFB51: Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module) 2005-11-18 19:01:50 +00:00
Marcus Boerger
75329fe178 - Reflection was moved into its own extension 2005-11-17 23:20:39 +00:00
Ilia Alshanetsky
bb94f372cb Hopefully resolve all the Apache 2 sub-request problems on non-linux systems. 2005-11-17 20:56:09 +00:00
foobar
58d21892e1 - Fix compile failure when ext/readline is compiled as shared 2005-11-17 08:36:12 +00:00
Ilia Alshanetsky
4ded4455eb MFB51: Fixed memory leak on php-cli -h 2005-11-15 15:30:41 +00:00
foobar
a05a33f34d - Fix the "php -v" output when neither --enable-debug or --enable-gcov
is used.
#
# Rasmus, now it should give proper output, please test.
2005-11-12 00:38:00 +00:00
Marcus Boerger
c1869299c7 - heredoc handling in -a mode 2005-11-07 19:12:37 +00:00
foobar
e4c8e1dc85 - Fixed minor memory leak triggered by: -dzlib.output_compression=1 -m 2005-11-06 22:41: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
Ilia Alshanetsky
14082e0e09 MFB51: Additional tweaks to the patch for bug #34249. 2005-10-26 15:08:42 +00:00
Ilia Alshanetsky
222fa05e1c Fixed -m memory leak 2005-10-19 21:57:35 +00:00
Antony Dovgal
65e6b4fafa initialize SG(request_info).auth_digest to NULL and prevent segfaults 2005-10-18 23:51:36 +00:00
Ilia Alshanetsky
cddb5c624a Fixed bug #34905 (Digest authentication does not work with Apache 1). 2005-10-18 23:14:47 +00:00
foobar
27d2fe07ff MF51:- Fixed bug #34850 (--program-suffix and --program-prefix not included in man page names) 2005-10-13 10:04:17 +00:00
Antony Dovgal
34d511ab9d MF51: fix bug #34581 (crash with mod_rewrite) 2005-10-12 21:31:49 +00:00
foobar
b233ce0dd8 - Removed confusing dot. 2005-10-11 18:58:27 +00:00
Johannes Schlüter
7e85bac9ec - Fix #34557 php -m exits with "error" 1 2005-10-06 20:29:13 +00:00
Ilia Alshanetsky
86401de381 MFH: Fixed possible INI setting leak via virtual() in Apache 2 sapi. 2005-10-05 00:42:54 +00:00
Johannes Schlüter
9147629f59 - Add --rclass and --rextension arguments to CLI 2005-10-03 11:54:46 +00:00
foobar
51ec5ca6da Check the status properly 2005-09-02 13:50:39 +00:00
foobar
08b695a3e8 - Revert -a to -A change, bad idea: It disables EXISTING lines too! 2005-09-01 14:33:37 +00:00
Ilia Alshanetsky
9fc26c42c2 Fixed bug #33987 (php script as ErrorDocument causes crash in Apache 2). 2005-08-18 01:11:13 +00:00
Johannes Schlüter
9ce521ec03 - Fix tab-completion in unicode mode and for constants. 2005-08-14 13:09:34 +00:00
foobar
680a00ea48 Nuke unused code 2005-08-12 00:06:43 +00:00
foobar
4b8025987f - Unused 2005-08-12 00:06:15 +00:00
Andrei Zmievski
264cec8be6 Unicode support. 2005-08-11 23:36:07 +00:00
Marcus Boerger
ef36d692cd - Johannes did a great work on the shell
# Now he wants to maintain CLI ?-)
2005-08-11 20:45:27 +00:00
foobar
000a9e3015 - Fixed problem with -dextension=foobar.so not having it's MINIT run. 2005-08-08 16:49:44 +00:00
Hartmut Holzgraefe
621238a3c3 fix extension loading from command line, resources didn't work
(still related to Bug #33899)
2005-08-08 08:45:33 +00:00
foobar
d77c684c42 - Changed -a to -A to prevent enabling PHP in httpd.conf automatically.
# Most distributions use separate file in a conf.d/ directory to enable
# PHP, using -a would add unnecessary line in the main httpd.conf and
# causes a warning during startup.
2005-08-05 08:14:54 +00:00
foobar
23e671a51e - Bumber up year 2005-08-03 14:08:58 +00:00
foobar
20241fe16a - 2004 -> 2005 2005-08-03 11:12:19 +00:00
Dmitry Stogov
cf6bb99723 Fixed bug #33723 (php_value overrides php_admin_value) 2005-08-01 07:46:54 +00:00
Rasmus Lerdorf
884c97d4d7 MFB fix for bug #33690 2005-07-25 22:38:11 +00:00
Marcus Boerger
ae1fa04899 - Bugfix #33733 2005-07-25 18:04:13 +00:00
Dmitry Stogov
8de3367453 Fixed support for shared extensions on AIX 2005-07-07 05:54:43 +00:00
Dmitry Stogov
d647e000a7 Fixed bug #33520 (crash if safe_mode is on and session.save_path is changed) 2005-07-04 12:47:10 +00:00
Brian France
3137e1e422 Added a SG(server_context) NULL check to php_apache_getenv.
This can get called when "<key> = ${<key>}:/foo" is used in a .ini file, but <key> has not be set yet.
        You will end up with a value of ":/foo", but at least it will not crash now.
2005-06-28 16:34:18 +00:00
Ilia Alshanetsky
a462e687dc Fixed possible memory corruption. 2005-06-21 00:12:35 +00:00