Commit Graph

1773 Commits

Author SHA1 Message Date
Frank M. Kromann
5e673e0639 Fix build on win32 2006-02-04 23:54:21 +00:00
Dmitry Stogov
aa1142eded Fixed bug #36158 (SIGTERM is not handled correctly when running as a FastCGI server) 2006-02-03 16:30:09 +00:00
Dmitry Stogov
6a176fa7b3 AIX support 2006-02-02 09:59:23 +00:00
Dmitry Stogov
7e7fcc3a07 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.
2006-02-02 08:17:23 +00:00
Marcus Boerger
cb27823e82 - MFH Show the exact version 2006-01-22 22:09:54 +00:00
Marcus Boerger
575e6b6e7c - Make clear what -a mode gets you 2006-01-14 02:09:37 +00:00
Rasmus Lerdorf
4d64a617c3 MFH: I don't recall the reason for messing with r->allowed here, so let's
get rid of it (and see who screams).  This should fix bug #32561
2006-01-06 18:06:38 +00:00
Ilia Alshanetsky
fb91408a17 Added param checks for ap2 fetch respose/request header functions. 2006-01-03 20:13:07 +00:00
Ilia Alshanetsky
a5e15f2e1c Fixed possible crash in apache_getenv()/apache_setenv() on invalid
parameters.
2006-01-02 22:19:37 +00:00
foobar
6d8c69e3cb MFH: fixed apache_setenv(): at least 2 parameters are required 2006-01-02 22:10:38 +00:00
Ilia Alshanetsky
488500acfb Added safety checks 2006-01-01 20:12:55 +00:00
foobar
5bd93221a8 bump year and license version 2006-01-01 12:51:34 +00:00
Sara Golemon
3795f9d8bb MFH(r-1.7) Silence compiler warning: unused variable 2005-12-29 06:02:17 +00:00
Andrei Zmievski
e6ae0e99c3 MFH 2005-12-16 22:45:12 +00:00
Ilia Alshanetsky
00b9392bf5 Fixed bug #35571 (Fixed crash in Apache 2 SAPI when more then one php
script is loaded via SSI include).
2005-12-14 03:36:44 +00:00
Marcus Boerger
c19fa0bbde - MFH Add method support to --rfunction 2005-12-11 02:41:04 +00:00
Marcus Boerger
ba6c82eee9 - MFH --r* switches 2005-12-11 02:17:34 +00:00
Dmitry Stogov
5461b5a6b1 Fixed bug #34429 (Output buffering cannot be turned off with FastCGI) 2005-12-09 17:01:50 +00:00
foobar
3e669bc950 MFH: nuke php3 legacy 2005-12-06 02:28:41 +00:00
foobar
b9af8f2719 MFH: nuke php3 legacy 2005-12-06 01:14:02 +00:00
foobar
d95275052b MFH 2005-12-06 01:08:49 +00:00
foobar
bde40a73db MFH: fix possible compile error 2005-12-03 01:28:16 +00:00
Antony Dovgal
1cbe552f4d change "-o" to "||" (fixes potential problems on weird systems where test doesn't support -o) 2005-11-29 18:26:02 +00:00
foobar
26b8b65c18 MFH: - Fixed bug #35409 (undefined reference to 'rl_completion_matches'). 2005-11-28 16:51:16 +00:00
Ilia Alshanetsky
110344d65c Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). 2005-11-18 18:59:49 +00:00
Ilia Alshanetsky
8f514cd18c MFH: Resolve Apache 2 regression with sub-request handling on non-linux
systems.
2005-11-17 21:00:28 +00:00
foobar
c127df868e MFH: - Fix compile failure when ext/readline is compiled as shared (bug #35249) 2005-11-17 08:37:31 +00:00
Ilia Alshanetsky
57e49322a5 Fixed memory leak on php-cli -h 2005-11-15 15:27:26 +00:00
Marcus Boerger
9c14ce94f3 - MFH heredoc handling in -a mode 2005-11-07 19:14:40 +00:00
foobar
6ec23a56d8 MFH:- Fixed minor leak with -dzlib.output_compression=1 -m 2005-11-06 22:42:23 +00:00
Michael Wallner
496fd1c041 - 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:38:13 +00:00
Ilia Alshanetsky
51d8950b53 Additional tweaks to the patch for bug #34249. 2005-10-26 15:08:23 +00:00
Ilia Alshanetsky
5bb29235dc MFH: Fixed -m memory leak 2005-10-19 21:57:45 +00:00
Antony Dovgal
e5928942ac MFH: initialize SG(request_info).auth_digest 2005-10-18 23:51:54 +00:00
Ilia Alshanetsky
24046edbbb MFH: Fixed bug #34905 (Digest authentication does not work with Apache 1). 2005-10-18 23:15:28 +00:00
foobar
3fbee80f35 - Fixed bug #34850 (--program-suffix and --program-prefix not included in man page names) 2005-10-13 10:02:59 +00:00
Antony Dovgal
f4371b9cc6 fix bug #34581 (crash with mod_rewrite) 2005-10-12 21:24:09 +00:00
foobar
28a0aef13e MFH: removed confusing dot. 2005-10-11 18:58:59 +00:00
Johannes Schlüter
d3dc0a39bc - MFH: Fix #34557 php -m exits with "error" 1 2005-10-06 20:29:41 +00:00
Ilia Alshanetsky
f2ed06347b MFH: Fixed possible INI setting leak via virtual() in Apache 2 sapi. 2005-10-05 00:43:38 +00:00
foobar
8c4d1f6657 MFH 2005-09-02 13:51:47 +00:00
foobar
1978e9109f MFH 2005-09-01 14:33:47 +00:00
Ilia Alshanetsky
e134382a71 MFH: Fixed bug #33987 (php script as ErrorDocument causes crash in Apache 2). 2005-08-18 01:14:42 +00:00
Johannes Schlüter
0d993d2172 - Fix tab-completion for constants. 2005-08-14 13:07:15 +00:00
Marcus Boerger
256e6e3350 - MFH creadits to Johannes 2005-08-11 20:45:58 +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
Antony Dovgal
8be61d707f fix #29683 (headers_list() returns empty array) 2005-06-20 12:46:34 +00:00
foobar
4dfa3fc731 Some netware related build issues fixed (patch by: Kamesh Jayachandran <kameshj at fastmail dot fm> 2005-06-20 11:06:54 +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
Marcus Boerger
acd747d374 - Expose -a as special mode and show whether it is a shell or not 2005-06-06 07:11:08 +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
Rasmus Lerdorf
091bff3570 Fix for bug #33057 - Don't send extraneous entity-headers on a 304 as per
RFC 2616 section 10.3.5
2005-05-19 15:57:45 +00:00
Johannes Schlüter
bb6f4dfc7d - Fix readline loop-condition
- Fix cli_is_valid_code detection
2005-05-17 14:33:15 +00:00
Marcus Boerger
51fe495ea1 - Add command completion to CLI's -a mode 2005-05-14 19:33:18 +00:00
foobar
d24f853464 typofix 2005-05-07 15:43:55 +00:00
Marcus Boerger
13ba056aff - Update 2005-05-07 13:54:02 +00:00
Marcus Boerger
1623537998 - Improved interactive mode of CLI (php -a) 2005-05-07 12:24:18 +00:00
foobar
626253940e - Added PHP_INSTALL_HEADERS() macro
- Fixed several VPATH build issues
- Changed all awk calls to use $AWK
- Changed all mkdir calls to use "$php_shtool mkdir"
2005-05-07 02:51:53 +00:00
foobar
d7682085c6 Silence the warnings about weird characters in this man page 2005-04-30 04:12:01 +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
Antony Dovgal
755b027e8c fix C++ comments 2005-04-22 08:59:21 +00:00
foobar
9af93dbb41 Expose EXEEXT and use for cli/cgi binaries 2005-04-21 14:57:53 +00:00
foobar
0e57528666 No c++ comments in C code 2005-04-19 11:41:04 +00:00
foobar
d5d9c6b8f3 - Fixed bug #31887 (Custom 5xx error does not return correct HTTP response message) 2005-04-17 03:37:05 +00:00
foobar
5fe1be8b5e - Say in the help too this is the handler module.. 2005-04-10 19:32:19 +00:00
foobar
d7f848d069 Might not be obvious for everyone :) 2005-04-10 19:29:08 +00:00
foobar
7af1dfa8cb - Fixed bug #32587 (Apache2: errors sent to error_log do not include timestamps) 2005-04-08 20:32:14 +00:00
Rui Hirokawa
8235a70ef9 added a server variable PHP_AUTH_DIGEST to support HTTP Digest Authentication. 2005-04-04 15:06:36 +00:00
Uwe Schindler
3fb36bf08e Add sapi.get_request_time() to NSAPI 2005-04-03 19:16:23 +00:00
Antony Dovgal
9ba5535993 fix #28803 (enabled debug causes bailout errors with CLI on AIX
because of fflush() called on already closed filedescriptor)
2005-03-22 15:08:52 +00:00
foobar
a98460beac Revert bad idea. (no more error for invalid -d options) 2005-03-18 22:11:53 +00:00
foobar
9c2c04b580 - Made CLI option -d output error and exit if an non-existing (or unmodifyable) entry is passed 2005-03-17 13:43:32 +00:00
Derick Rethans
42b9b26e45 - ZTS fixes
#- Andrei, it would be nice if you could test ZTS builds too before you
#  commit...
2005-03-17 07:31:22 +00:00
Andrei Zmievski
06667585b5 Make it possible to load shared extensions from command line via
-dextension= mechanism.
2005-03-15 22:41:12 +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
Wez Furlong
07fd652824 it's 2005 already
# and we're all too lazy to go through and update all the copyright years :)
2005-03-12 14:07:35 +00:00
Joe Orton
bef3202d9e - Fixed bug #31717: Reject PATH_INFO if "AcceptPathInfo off" is used. 2005-03-10 11:09:32 +00:00
foobar
84e560435e MFB: Fix VPATH build 2005-03-06 23:16:44 +00:00
foobar
a942bcd669 Merge from sapi/apache/config.m4 and cleanup 2005-03-04 15:15:26 +00:00
foobar
4c883c79bb Do not set apache stuff if not building apache 2005-03-04 15:14:47 +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
Derick Rethans
7b27263e16 - There is no --with-apache2, only apxs2 2005-01-26 18:03:04 +00:00
Andrei Zmievski
27b1a27faf MFB (Fix several egregious leaks in ext/browscap and sapi/embed). 2005-01-25 21:33:58 +00:00
Joe Orton
62121a1840 Fixed regression #31645 - only flush before running the subrequest. 2005-01-24 11:44:56 +00:00
foobar
2c65e09a4b - Revert the weird change of ZEND_STRS() macro and use the correct
ZEND_STRL() macro.
# ZEND_STRS was changed to be same as ZEND_STRL..someone on crack? :)
2005-01-20 02:02:09 +00:00
Joe Orton
8288c451c0 Fixed bug #31519: Set r->status_line to SAPI-provided status-line. 2005-01-17 12:24:40 +00:00
foobar
14058c83e6 - Fix another generated header include 2005-01-14 20:44:28 +00:00
Joe Orton
cb6605c1a5 Fixed bug #30446 - virtual() includes files out of sequence,
work around 2.0 subrequest/internal redirect issue.
2005-01-11 14:01:32 +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
05adbd51b4 - Fixed bug #31055 (apache2filter: per request leak proportional to the full path of the request URI) 2005-01-07 06:28:08 +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
foobar
a903822561 Missing cvs id tag 2004-12-18 03:14:39 +00:00
foobar
ce742b08b0 - Fix typo (avaliable -> available). (bug #28725) 2004-12-16 12:34:32 +00:00
Moriyoshi Koizumi
28cc55be0a - Apply the same fix to apache2filter too. 2004-12-12 23:06:06 +00:00
Moriyoshi Koizumi
a0975f8dcf - Fixlet for httpd-2.1 on Darwin platforms 2004-12-12 02:11:27 +00:00
Stanislav Malyshev
9baa92c596 fix startup - if startup did not succeed, do not continue with execution 2004-12-06 18:55:30 +00:00
Stanislav Malyshev
f9c2324cd0 do not zero out peak - MM shutdown would do that 2004-12-06 18:48:35 +00:00
Holger Zimmermann
b36a4c57ca Replaced static server variables by function call and configurable list at the Pi3Web server side. 2004-12-05 09:52:25 +00:00
Rasmus Lerdorf
3d297bf881 Fix proto 2004-12-04 13:47:13 +00:00
Rasmus Lerdorf
224d2479b3 Add apache_reset_timeout() function for Apache1. This is needed because
Apache1 only resets the write timer, which defaults to 300 seconds, on
a successful write.  That is, if the client has gone away and Apache
attempts a write which fails it will set the conn->aborted flag but not
reset the timeout.  Assuming the PHP script is running in ignore_user_abort
mode we ignore the aborted flag, but we'll still get blown out of the water
300 seconds after the failed write unless we periodically reset the timer.
With set_time_limit(0), ignore_user_abort(true) and periodic
apache_reset_timeout() calls we can theoretically run forever which is
why I disabled this call in safe mode.
2004-12-04 07:16:44 +00:00
Antony Dovgal
71d9afee0c fix CLI leaks when using malformed option string 2004-11-15 14:00:48 +00:00
Frank M. Kromann
1d04952b1d Fix typo in man page. Bug #30727. Patch by Jakub Vrana 2004-11-09 15:05:20 +00:00
Joe Orton
1f364c1ee1 - always convert apr_time_t to time_t using apr_time_sec() to be future-proof.
- print apr_time_t values using APR_TIME_T and apr_snprintf.
- remove redundant add_property_long calls.
2004-10-23 13:48:05 +00:00
Joe Orton
516a19f1ec Fix the get_request_time implementation for the 2.0 SAPIs to return
seconds not microseconds and to use TSRM stuff correctly.
2004-10-23 12:56:20 +00:00
Joe Orton
1ef6c7add1 Fix case where php_handle_aborted_connection was called outside a
try/end_try block (#25570).
2004-10-20 09:28:47 +00:00
Anantha Kesari H Y
315e58f2f6 As NetWare LibC has optind and optarg macros defined in unistd.h our local variables were getting mistakenly preprocessed so undeffing optind and optarg 2004-10-08 12:22:35 +00:00
Anantha Kesari H Y
ac5b702b91 removed redundant CLIB_STAT_PATCH checks for NETWARE 2004-09-24 15:44:57 +00:00
Anantha Kesari H Y
13163ad5e4 TSRMLS_FETCH should be called prior to accessing any of the SG members 2004-09-23 15:08:31 +00:00
Anantha Kesari H Y
d2e85c5c9a NetWare now has a POSIX compliant stat structure so no need of CLIB_STAT_PATCH and all such macros 2004-09-23 14:36:42 +00:00
Uwe Schindler
74fe4ec0cb changed order of processing of ini entries 2004-09-20 13:30:13 +00:00
Uwe Schindler
5e1f396849 Fixed bug #29805 (HTTP Authentication Issues) 2004-09-15 21:28:30 +00:00
Derick Rethans
6ffc1c291a - MFB: Fixed Apache 2.0 SAPI build against Apache 2 HEAD. (Patch by Joe Orton) 2004-08-23 09:01:27 +00:00
Antony Dovgal
ad503c814b MFB: typo in config.m4 (potential configuration problem with Stronghold) 2004-08-18 07:22:54 +00:00
Marcus Boerger
364c2fe5a2 TSRM fix 2004-08-11 20:51:41 +00:00
Rasmus Lerdorf
cad60c3760 Add SAPI hook to get the request time if provided by the web server,
otherwise call time(0) on the first call and store it so subsequent
calls will get the same time.  Hook support for Apache1/2 included.
2004-08-10 17:40:00 +00:00
Wez Furlong
3d9eeb4538 Move activescript sapi to PECL 2004-07-28 12:35:52 +00:00
Wez Furlong
9a19f065af - Rename ProgID from ActivePHP (tm) to PHPScript (bah)
- Convert line-endings for error messages to CRLF
- Misc other tweaks
2004-07-28 12:32:49 +00:00
Wez Furlong
20eac88e58 Tidy up a few loose ends.
Override normal php.ini behaviour so that only the launching applications
folder is searched; this avoids picking up a default php.ini with an execution
time limit set.
2004-07-27 22:36:56 +00:00
Wez Furlong
ac87800760 Major re-jig.
With thanks to Rob Richards for tracking down a couple of big bugs caused by
teeny bits of code.
2004-07-27 03:57:31 +00:00
Rob Richards
6b0cc4b54d fix build for VC++ 6
update dsp (Enable IObjectSafety)
2004-07-24 14:07:08 +00:00
Wez Furlong
e67ad79599 Enable IObjectSafety so that we can be used in the M$ scripting control.
Thanks to Rob for checking this out.
2004-07-24 13:18:56 +00:00
Edin Kadribasic
728b849529 Fix for #28929 by Michael Sisolak 2004-07-21 22:52:50 +00:00
Andi Gutmans
56f8195fe5 - Nuke empty_string. It is a reminanent from the time where RETURN_FALSE()
used to return "" and not bool(false). It's not worth keeping it because
  STR_FREE() and zval_dtor() always have to check for it and it slows down
  the general case. In addition, it seems that empty_string has been abused
  quite a lot, and was used not only for setting zval's but generally in
  PHP code instead of "", which wasn't the intention. Last but not least,
  nuking empty_string should improve stability as I doubt every place
  correctly checked if they are not mistakenly erealloc()'ing it or
  calling efree() on it.
  NOTE: Some code is probably broken. Each extension maintainer should
  check and see that my changes are OK. Also, I haven't had time to touch
  PECL yet. Will try and do it tomorrow.
2004-07-19 07:19:50 +00:00
Moriyoshi Koizumi
2af6d0e1ab - request_dtor() should be called if a fatal error occurs during activation
phase.
2004-07-17 21:29:50 +00:00
Edin Kadribasic
546e5bbc43 Made php -m output sorted case-insensitevly 2004-07-14 22:30:29 +00:00
Stefan Esser
90f151470c same bug. 2004-07-14 09:55:24 +00:00
Stefan Esser
446f4d1bc2 Security Fix broken! Destroyed Basic auth. Blame: me
4.3.x not affected
2004-07-14 09:43:26 +00:00
Andi Gutmans
e5cfb1d05c - Better stability during premature shutdown of request startup 2004-07-10 07:46:17 +00:00
Sascha Schumann
f51ff68dfa - revert to proper behaviour 2004-07-05 11:41:31 +00:00
Uwe Schindler
3bb7e73656 replace strncpy with strlcpy 2004-06-26 10:30:07 +00:00
Edin Kadribasic
42f7b8026c MFB: Memory leak fix (patch by Joe Orton)
Fixes #28113. Adapted to php5 by Magnus Määttä.
2004-06-25 13:00:48 +00:00
Uwe Schindler
8327d4e2bd Addendum to bug #28878: change ini keys as PHP_INI_SYSTEM
Also: Adding "bucket" parameter to non-ini-keys, Elemination of double CONTENT_TYPE/_LENGTH environment variables
2004-06-23 13:02:01 +00:00
Alex Leigh
ef81373201 Updated the author's contact information. 2004-06-22 18:08:03 +00:00