1
0
mirror of https://github.com/php/php-src.git synced 2026-04-25 17:08:14 +02:00
Commit Graph

415 Commits

Author SHA1 Message Date
Rasmus Lerdorf 6652657f12 Fix bug #50940 2010-02-05 18:59:05 +00:00
Sebastian Bergmann 16cb1cd469 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Sebastian Bergmann ef49b9a8de MFH: Bump copyright year, 3 of 3. 2008-12-31 11:17:49 +00:00
Stanislav Malyshev 7a67e94f17 init SG(server_context) before processing configs 2008-11-28 23:22:39 +00:00
Stanislav Malyshev 40607b254a fix php_value application order for Apache 2008-11-24 22:18:25 +00:00
Sebastian Bergmann d9f3a1305f MFH: Bump copyright year, 2 of 2. 2007-12-31 07:20:42 +00:00
Jani Taskinen fef2b33e85 MFH:- Fixed bug #42579 (apache_reset_timeout() does not exist) 2007-09-07 08:49:24 +00:00
Antony Dovgal 83e7324dae fix build 2007-08-06 12:54:57 +00:00
Jani Taskinen fc2fef68ac - ws + sync apache2filter apache_config.c with the one from apache2handler 2007-08-03 09:32:34 +00:00
Stanislav Malyshev c94dee8696 implement separate .htaccess stage 2007-08-03 01:14:44 +00:00
Jani Taskinen eb923bf6fc MFH: - Changed AC_ARG_* options to PHP_ARG_* options.
MFH: - Some cleanups here and there
MFH: - Enabled PHP_CHECK_CONFIGURE_OPTIONS (checks for unknown configure
MFH:   options)
# Note to Marcus: ext/dba/config.m4 needs to be "converted" to use
# the PHP_ARG_* options. I did't touch it needs quite a lot of work to keep
# it's current behaviour regarding "enabled-by-default" parts of it.
#
# Hint: By using the PHP_ARG_* options you have the "default" option.. ;)
2007-07-11 23:20:37 +00:00
Scott MacVicar b73d2a94ae Fixed bug #41628 (PHP settings leak between Virtual Hosts in Apache 1.3). 2007-06-18 15:52:46 +00:00
foobar 7bd41e0715 MFH:- Fixed bug #41576 (misbehaviour when using --without-apxs) 2007-06-03 20:27:16 +00:00
Marcus Boerger 50ea26760d - Avoid sprintf, even when checked copy'n'paste or changes lead to errors 2007-02-24 02:17:47 +00:00
Stanislav Malyshev e894206874 use snprintf 2007-02-23 21:38:25 +00:00
Sebastian Bergmann 4223aa4d5e MFH: Bump year. 2007-01-01 09:36:18 +00:00
Antony Dovgal 46a6bd7f9d MFH 2006-12-28 13:30:25 +00:00
Dmitry Stogov 53b088e60c Make MEMORY_LIMIT and ZEND_USE_MALLOC_MM to be always enabled. They don't make any significant slowdown, but incrise maintainability a lot. Note that the setting of memory_limit wasn't changes (neither in main/main.c nor in php.ini) and it still set to 16M. 2006-12-20 10:49:33 +00:00
Ilia Alshanetsky 6123f11021 MFH:
Added filter support for $_SERVER in cgi/apache2 sapis
	Make sure PHP_SELF is filtered in Apache 1 sapi
2006-11-03 13:51:48 +00:00
Brian France 33879eceb3 Memory assigned to the request_rec should be allocated from apache pools
and should not be free'ed at the end of the handler phase
2006-10-12 20:02:58 +00:00
Nuno Lopes 47713b1eb7 more int->zend_bool conversions 2006-09-06 11:54:29 +00:00
Dmitry Stogov 29e1530cd7 Added "PHPINIDir" Apache directive to apache and apache_hooks SAPIs 2006-08-03 09:56:50 +00:00
Dmitry Stogov 356facf4af 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:40:05 +00:00
Dmitry Stogov 29ed52ffa4 New memory manager 2006-07-18 09:06:33 +00:00
Rasmus Lerdorf 6fb0bf80ea Switch to a signed int for now. Will look at moving to a long throughout
the code here.
2006-05-13 21:50:28 +00:00
Rasmus Lerdorf 4df7ab403c Add input_filter hook call in getenv() 2006-05-10 21:19:32 +00:00
Edin Kadribasic af11e1d592 Correctly import external data (#33292) 2006-04-26 09:31:23 +00:00
Ilia Alshanetsky 46ba651680 MFH:
Removed extra space in the Content-Type header for logos
Simplified stderr error reporting in apache sapi.
2006-04-02 17:58:17 +00:00
Antony Dovgal 8068342483 MFH: fix #36400 (Custom 5xx error does not return correct HTTP response error code) 2006-02-15 11:09:05 +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
foobar 5bd93221a8 bump year and license version 2006-01-01 12:51:34 +00:00
Andrei Zmievski e6ae0e99c3 MFH 2005-12-16 22:45:12 +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
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 23e671a51e - Bumber up year 2005-08-03 14:08:58 +00:00
Dmitry Stogov cf6bb99723 Fixed bug #33723 (php_value overrides php_admin_value) 2005-08-01 07:46:54 +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
Antony Dovgal 8be61d707f fix #29683 (headers_list() returns empty array) 2005-06-20 12:46:34 +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
foobar 0e57528666 No c++ comments in C code 2005-04-19 11:41:04 +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
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 4c883c79bb Do not set apache stuff if not building apache 2005-03-04 15:14:47 +00:00
Derick Rethans 7b27263e16 - There is no --with-apache2, only apxs2 2005-01-26 18:03:04 +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 ad503c814b MFB: typo in config.m4 (potential configuration problem with Stronghold) 2004-08-18 07:22:54 +00:00