Commit Graph

788 Commits

Author SHA1 Message Date
Antony Dovgal
e3b672bb23 MFH: make use of zend_atol() 2008-03-19 12:42:16 +00:00
Rasmus Lerdorf
6c158374ba exit_on_timeout patch
After the sigsetjmp change, this is patch #2 in an effort to get some
sanity restored to signal handling in PHP.

This patch does two things.  First, it makes it possible to reset the
timeout without resetting the signal handlers.  This is important for
cases where an extension may have deferred signals in its MINIT in order
to implement critical sections. It also lays the groundwork for cleaning
up our signal handling and perhaps eventually implementing our own
signal deferring mechanism so we can have true critical sections.

The second thing this does is to make it possible to terminate the current
child process (only for Apache1 at the moment) on a timeout.  There are
a number of extensions that are unhappy about being longjmp'ed out of
and when this happens on a timeout they are left in an inconsistent state.
By turning on exit_on_timeout you can now force the process to terminate
on a timeout which will clean up any hanging locks and/or memory left
hanging after the longjmp.
2008-03-18 21:42:50 +00:00
Felipe Pena
2b10c53ae1 MFH: Dropped zend.ze1_compatibility_mode
[DOC]
2008-03-18 14:10:45 +00:00
Felipe Pena
40f83dad26 Fix build (ZTS) 2008-03-16 21:55:46 +00:00
Marcus Boerger
af316021e8 - Rewrite scanner to be based on re2c instead of flex
The full patch is available as:
  http://php.net/~helly/php-re2c-5.3-20080316.diff.txt
  This is against php-re2c repository version 98
  An older patch against version 97 is available under:
  http://php.net/~helly/php-re2c-97-20080316.diff.txt
2008-03-16 21:06:55 +00:00
Stanislav Malyshev
a9fe1010d2 [DOC] add request_order INI variable to control $_REQUEST content
# if not set (default), variables_order still is used
# request_order accepts G,P and C
2008-03-12 20:24:45 +00:00
Etienne Kneuss
e9a6f0f24a MFH: User error handlers no longer catch supressed errors 2008-03-08 22:12:32 +00:00
Dmitry Stogov
ab232458c7 Optimized require_once() and include_once() by eliminationg open() syscall on second usage. 2008-03-05 13:34:12 +00:00
Marcus Boerger
d3e5026564 - MFH Add E_DEPRECATED (Lars Strojny, Felipe Pena, Marcus)
[DOC] Finally added deprecation messages
2008-02-23 17:06:22 +00:00
Pierre Joye
4652c2bf2c - [DOC] add PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION,
PHP_EXTRA_VERSION, PHP_VERSION_ID, PHP_ZTS and PHP_DEBUG constants
2008-02-15 14:51:39 +00:00
Jani Taskinen
a0f168752e MFH: allow using these constants in php.ini (f.e. PHP_SAPI..) 2008-02-04 20:39:21 +00:00
Dmitry Stogov
71592cec06 Added garbage collector 2008-01-22 09:27:48 +00:00
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Hannes Magnusson
d7f7fa0494 MFH: Update the class method documentation links 2007-12-29 02:21:57 +00:00
Dmitry Stogov
648fbe9d58 Fixed bug #43128 (Very long class name causes segfault) 2007-11-22 13:27:13 +00:00
Dmitry Stogov
8039433291 Fixed bug #42722 (display_errors setting ignored for E_PARSE and HTTP 500 page) 2007-10-18 13:11:46 +00:00
Ilia Alshanetsky
086289983e Refactor code to make fixes for coverity issues #385 and #386 a bit more
obvious
2007-10-01 14:51:11 +00:00
Jani Taskinen
09b6f37f20 MFH:
- Added ".htaccess" style user-defined php.ini files support for
  CGI/FastCGI.
- Added support for special [PATH=/opt/httpd/www.example.com/] sections
  in php.ini. All directives set in these sections will not be able to be
  overridden in user-defined ini-files or during runtime in the specified
  path.

- Improved php.ini handling:
  . Added better error reporting for syntax errors in php.ini files
  . Allowed "ini-variables" to be used almost everywhere ini php.ini files
  . Allowed using alphanumeric/variable indexes in "array" ini options
  . Fixed get_cfg_var() to be able to return "array" ini options

- Fixed bug #27372 (parse error loading browscap.ini at apache startup)
- Fixed bug #42069 (parse_ini_file() allows using some non-alpha numeric
  characters)
2007-09-28 02:05:10 +00:00
Dmitry Stogov
884b06e303 Fixed crash on POST request after dl("mbstring.so") 2007-09-24 11:53:40 +00:00
Antony Dovgal
74ae13f933 MFH: check for NULL (coverity issue #386) 2007-09-21 14:12:52 +00:00
Stanislav Malyshev
cd836153d6 disallow setting mail.force_extra_parameters from .htaccess 2007-09-13 20:04:22 +00:00
Jani Taskinen
77c36cd259 MFH: ws 2007-08-31 08:35:37 +00:00
Stanislav Malyshev
df11ce1ece check correct value 2007-08-03 01:30:21 +00:00
Stanislav Malyshev
1b131c46ad make error_log setting access-controlled by safe_mode/open_basedir 2007-08-03 01:15:51 +00:00
Stanislav Malyshev
959aa4f596 revert wrong fix 2007-08-01 23:51:45 +00:00
Johannes Schlüter
25848bff61 - MFH: Fix #42164 Internal Sendmail Support is ALWAYS disabled 2007-08-01 12:49:34 +00:00
Antony Dovgal
99a162bb8b fix ZTS build 2007-07-24 20:32:32 +00:00
Jani Taskinen
335cac3c6a MFH:- Changed "display_errors" php.ini option to accept "stderr" as value which
MFH:  makes the error messages to be outputted to STDERR instead of STDOUT with
MFH:  CGI and CLI SAPIs (FR #22839).
2007-07-24 14:21:36 +00:00
Jani Taskinen
d271071067 MFH: Fixed compile warnings 2007-07-21 01:43:33 +00:00
Jani Taskinen
cc7342ef72 MFH: folding tags and some more ws fixes 2007-07-15 15:34:28 +00:00
Jani Taskinen
aad63942b8 MFH: ws fixes (sync!) 2007-07-15 15:21:12 +00:00
Ilia Alshanetsky
a2fa9bbe84 Clear out last error & last error file information at the end of the
request to ensure that they don't propogate to the next request
2007-07-15 14:15:02 +00:00
Johannes Schlüter
dc8d09bbbd - MFH: Always enable mail() function 2007-07-11 17:36:56 +00:00
Jani Taskinen
7b016d72a1 MFH: No return values for void function 2007-07-11 10:24:04 +00:00
Stanislav Malyshev
6f1b3ea73a suppress warnings to avoid potential loop 2007-07-10 17:58:19 +00:00
Stanislav Malyshev
84c9050805 check if write is allowed before writing to error log 2007-07-10 17:42:29 +00:00
Dmitry Stogov
539f67ed8f Added ability to create local or remote (URL) user streams
Local user streams must not be able to open(), URLs if allow_url_include is off
Implemented new function stream_is_local()
[
- stream_wrapper_register() extended with additional optional argument "flags"
  of type long. This time only one flag is implemented
- STREAM_IS_URL, that means that userstream wrapper is remote (URL).
  By default stream is local.
- stream_is_local() is a new function that accepts stream and tell if this
  stream is local or remote (URL)
]
2007-07-09 17:27:24 +00:00
Dmitry Stogov
e1f08c8297 HTTP 500 is sent to browser in case of PHP error instead of blank page 2007-06-15 09:20:27 +00:00
Dmitry Stogov
c2e04e8364 Prevent crash in case of wrong arguments to CRT functions (strftime()) on PHP complead by MS VC2005 2007-06-15 07:27:08 +00:00
Antony Dovgal
c9805e7b92 MFH: check return value of *time_r() functions for NULL 2007-06-07 08:44:41 +00:00
Rob Richards
b6b312c020 add file locking under windows
change win build to use common clock compat files
2007-04-18 09:38:59 +00:00
Dmitry Stogov
e1814f0dbe WIN64 support 2007-04-16 08:09:56 +00:00
Ilia Alshanetsky
aa18505f34 Avoid locks when appening to the error log file 2007-04-06 13:58:48 +00:00
Ilia Alshanetsky
642432a5de Fixed bug #40897 (error_log file not locked) 2007-04-01 19:29:42 +00:00
Stanislav Malyshev
32fb34e2d1 limit nesting level of input variables 2007-03-02 21:58:05 +00:00
Marcus Boerger
6ded8042b9 - MFH Fix memleak with temp dir 2007-02-07 21:01:06 +00:00
Ilia Alshanetsky
c5fb061cbf Provide means for opening file for zend with error supression. Allows us to
avoid INI hackery such as the one used in SPL.
2007-01-08 03:39:09 +00:00
Sebastian Bergmann
4223aa4d5e MFH: Bump year. 2007-01-01 09:36:18 +00:00
Antony Dovgal
d3a651a39e MFH 2006-12-28 12:01:50 +00:00
Ilia Alshanetsky
b85f1345a6 Ensure that OnUpdateLongGEZero is greater or equal to 0.
Added a update wrapper for ensuring >0 values
2006-12-25 23:55:59 +00:00
Ilia Alshanetsky
52d53543ac Allocation safety checks 2006-12-25 22:36:57 +00:00
Dmitry Stogov
3ffc1c8f4a Default memory_limit value is set to 128M 2006-12-21 09:12:42 +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
e8bc39d95d Fixed compiler warning 2006-12-17 18:30:36 +00:00
Stanislav Malyshev
6b651f8e60 Improve tolower()-related functions on Windows and VC2005 by caching locale and using
tolower_l function.
# Gives 10-18% speedup on bench.php
# Does not change behaviour for non-windows
2006-12-04 18:37:15 +00:00
Antony Dovgal
bcf457d828 MFH: fix retval type 2006-12-04 15:58:48 +00:00
Dmitry Stogov
79c3defac0 Fixed bug #39548 (ZMSG_LOG_SCRIPT_NAME not routed to OutputDebugString() on Windows) 2006-11-23 08:37:21 +00:00
Dmitry Stogov
c06f9e1efe COM initialization/deinitialization are done only if necessary 2006-11-17 11:40:52 +00:00
Dmitry Stogov
532b02cd19 Implemented registry cache that prevent registry lookup on each request. In case of modification of corresponding registry-tree PHP will reload it automatic. 2006-11-10 11:42:07 +00:00
Ilia Alshanetsky
ccc25cc3eb Fixed bug #38904 (apache2filter changes cwd to /). 2006-09-25 14:48:33 +00:00
Ilia Alshanetsky
fe6effeeb4 Avoid generating php_errormsg twice in some instances. 2006-09-18 23:08:36 +00:00
Ilia Alshanetsky
5aa6dcc6c8 Fixed memory leak on require() error 2006-09-18 03:29:21 +00:00
Ilia Alshanetsky
3a211712eb Increased default memory limit to 16 megabytes to accommodate for a more
accurate memory utilization measurement.
2006-08-17 13:43:08 +00:00
Michael Wallner
46f21b8a32 MFH: added error_get_last() function 2006-07-19 12:25:46 +00:00
Dmitry Stogov
29ed52ffa4 New memory manager 2006-07-18 09:06:33 +00:00
Dmitry Stogov
d68797945a Fixed memory leaks in ZTS mode. 2006-07-17 07:20:12 +00:00
Rasmus Lerdorf
6bfeea9eb9 MFH: Backported allow_url_include from HEAD. This directive allows
separate control of URL handling in includes/requires allowing sites to
enable allow_url_fopen without enabling remote includes.
2006-06-16 14:09:01 +00:00
Andrei Zmievski
b8ebfce9af Revert accidentally committed internal patch 2006-05-31 21:48:43 +00:00
Andrei Zmievski
1f04ac91b0 MFB 2006-05-31 17:18:08 +00:00
Edin Kadribasic
740d39454b Initialize windows globals, fixes #37428 2006-05-24 22:00:15 +00:00
Dmitry Stogov
14f6b9149d Optimized zend_try/zend_catch macroses (eliminated memcpy()) 2006-05-19 06:09:15 +00:00
Ilia Alshanetsky
cccb406ee8 Disable realpath cache when open_basedir or safe_mode are enabled on a
per-request basis.
2006-05-16 00:39:32 +00:00
Dmitry Stogov
1f41b288e9 Fixed bug #37306 (max_execution_time = max_input_time) 2006-05-11 22:10:31 +00:00
Marcus Boerger
f7776502b5 - MFH Fix error mode handling 2006-05-11 07:56:36 +00:00
Antony Dovgal
8a03fc5ef3 add missing parts of E_RECOVERABLE merge 2006-05-10 14:04:18 +00:00
Antony Dovgal
d23c1d763b fix #37053 (html_errors with internal classes produces wrong links) 2006-04-12 12:49:39 +00:00
Dmitry Stogov
ead7652457 We don't need setup the same time-out two times. 2006-04-07 11:44:03 +00:00
Dmitry Stogov
658ac96cfa Fixed bug #36809 (__FILE__ behavior changed) 2006-03-21 08:49:42 +00:00
Dmitry Stogov
98bacb0e21 Fixed bug #35988 (Unknown persistent list entry type in module shutdown) 2006-03-14 15:16:07 +00:00
Dmitry Stogov
d21669fc80 Fixed realpath() cache for main script with FastCGI SAPI 2006-03-13 09:35:45 +00:00
Brian France
6c4e9d30b9 MFH:
for the primary file only lookup the real file path and
        add it to the included_files list if already opened
        otherwise it will get opened and added to the included_files list in zend_execute_scripts
2006-03-10 18:19:29 +00:00
Sara Golemon
6dff869c51 MFH: Move temporary local storage of primary file's realpath up one block to ensure it stays on the stack. 2006-03-09 20:32:22 +00:00
Marcus Boerger
5a69b29082 - Warning fixes by Steph 2006-02-26 10:57:00 +00:00
Dmitry Stogov
b179e081ab Fixed bug #36268 (Object destructors called even after fatal errors) 2006-02-03 09:31:59 +00:00
Dmitry Stogov
4b1791a767 Fixed bug #36016 (realpath cache memleaks) 2006-01-16 09:12:22 +00:00
foobar
5bd93221a8 bump year and license version 2006-01-01 12:51:34 +00:00
Ilia Alshanetsky
2796160d15 Better critical error handling (fix for previous html encoding patch). 2005-12-07 02:37:05 +00:00
Ilia Alshanetsky
481ec28566 Fixed bug #30760 (Remove MessageBox on win32 for E_CORE errors if
display_startup_error is off).
2005-12-06 23:32:06 +00:00
Ilia Alshanetsky
aa1b0709f2 Fixed possible XSS inside error reporting functionality. 2005-12-06 03:09:24 +00:00
foobar
d95275052b MFH 2005-12-06 01:08:49 +00:00
Ilia Alshanetsky
363b0ce10b Fixed bug #35170 (PHP_AUTH_DIGEST differs under Apache 1.x and 2.x). 2005-11-25 00:02:16 +00:00
Dmitry Stogov
8c100e6451 Fixed bug #35176 (include()/require()/*_once() produce wrong error messages about main()) 2005-11-15 11:13:43 +00:00
Rob Richards
b551a55bca MFH: PHP_CONFIG_FILE_PATH needs to use strlen() due to Win build 2005-10-10 02:26:56 +00:00
Derick Rethans
a5f0cbed44 - Fixed shutdown order before RC2. 2005-09-14 20:08:31 +00:00
foobar
1890173d8c Revert 2005-09-02 14:05:46 +00:00
foobar
64cfbf539f MFH: - Fixed bug #34307 (OnUpdateStringUnempty INI options can be set empty) 2005-09-01 14:44:15 +00:00
foobar
5516735c88 MFH 2005-08-17 07:54:07 +00:00
Marcus Boerger
e8b05734be - Prevent E_STRICT from ending up as exception 2005-08-16 18:10:34 +00:00
foobar
8864ad2606 - This ini option is only effective when set in php.ini or httpd.conf
or .htacces, etc. as GPC variables are set before any ini_set() is called
2005-08-05 21:44:26 +00:00
foobar
23e671a51e - Bumber up year 2005-08-03 14:08:58 +00:00