Commit Graph

2011 Commits

Author SHA1 Message Date
Dmitry Stogov
5304e5631f Fix for bug #45786 (FastCGI process exited unexpectedly) 2008-08-18 10:49:35 +00:00
Dmitry Stogov
4362b07e62 Fixed double call to MSHUTDOWN in case of php-cgi -m 2008-08-15 07:30:50 +00:00
Jani Taskinen
13dff74889 fix tests 2008-08-14 20:51:35 +00:00
Antony Dovgal
593e7c7da4 MFH: nuke unused var 2008-08-14 09:46:26 +00:00
Jani Taskinen
e5e6f553a2 MFH 2008-08-13 00:53:28 +00:00
Dmitry Stogov
05376077b3 Fixed bug #45779 (regression with shebang lines processing) 2008-08-12 16:43:53 +00:00
Nuno Lopes
9732c409a4 fix this, so that I can build php without litespeed.. 2008-08-07 19:32:15 +00:00
George Wang
7c7bb11bcd use PHP_ARG_WITH instead of AC_ARG_WITH 2008-08-07 16:41:31 +00:00
George Wang
52604d2832 added litespeed SAPI 2008-08-05 22:37:32 +00:00
Dmitry Stogov
7355c3c54c Removed shebang line check from CGI sapi (it is checked by scanner) 2008-08-04 07:20:15 +00:00
Jani Taskinen
b17dc14f18 MFH: nuketh C++ comments 2008-08-03 12:15:55 +00:00
Jani Taskinen
a31dc18b39 MFH:- Fixed bug #45568 (ISAPI does not property clear auth_digest in header). 2008-07-31 00:48:48 +00:00
Antony Dovgal
5265201075 fix warnings 2008-07-25 15:05:48 +00:00
Arnaud Le Blanc
aa31988e43 MFH: Allow filters to work on INPUT_SERVER in CLI (bug #44779) 2008-07-24 09:12:45 +00:00
Antony Dovgal
28a22396d4 MFH: invert the logics - FLAG_FCLOSE -> FLAG_NO_FCLOSE 2008-07-23 11:25:14 +00:00
Felipe Pena
fdfbfb96a1 - MFH: Fixed bug #44246 (closedir() accepts a file resource opened by fopen()) 2008-07-22 14:09:24 +00:00
Dmitry Stogov
baab204436 Fixed chdir() into requested file directory inconsistencies 2008-07-21 08:43:36 +00:00
Felipe Pena
b22f47ee30 - Added arginfo 2008-07-20 14:28:41 +00:00
Scott MacVicar
35c58958a2 Fix compile error due to the removal of fteller on streams. 2008-07-18 13:08:08 +00:00
Felipe Pena
67185d6098 - Added arginfo 2008-07-16 11:59:15 +00:00
Dmitry Stogov
05f3ed67d4 Fixed bug #45151 (Crash with URI/file..php (filename contains 2 dots)) 2008-07-15 13:39:17 +00:00
Dmitry Stogov
c27eba9bcf Fixed bug #45423 (fastcgi parent process doesn't invoke php_module_shutdown before shutdown) (basant dot kukreja at sun dot com) 2008-07-15 13:11:19 +00:00
Antony Dovgal
8793440eee fix test 2008-07-13 09:42:25 +00:00
Nuno Lopes
180a7bef35 add test for the shebang thing 2008-07-06 16:59:39 +00:00
Nuno Lopes
504fe5eedb fix test for good consoles (tm) 2008-07-06 16:38:18 +00:00
Antony Dovgal
d76ecaae08 long -> int + minor sources reorganization 2008-07-01 07:58:42 +00:00
Alexey Zakhlestin
d33c8680ab fixed types (no more compiler warnings) 2008-06-28 10:01:17 +00:00
Alexey Zakhlestin
0045cb305b updated to the new parameter-parsing api 2008-06-28 09:52:03 +00:00
Dmitry Stogov
8054f84a3c Fixed possible buffer overflow 2008-06-23 11:37:50 +00:00
Uwe Schindler
48bfd44789 MFH: Response to: [PHP-DEV] cleaning up the functions - any volunteers? :) 2008-06-22 18:09:41 +00:00
Antony Dovgal
6b68a94242 fix test 2008-06-06 07:45:51 +00:00
Scott MacVicar
938186a67f Fixed bug #45144 (ap_child_terminate() isn't available on threaded builds) 2008-06-01 16:08:52 +00:00
Elizabeth Marie Smith
7d4dfa8ee4 Windows configure fixes, a few additional lib names allowed, apache2 only on for zts builds since apache on win is always threaded, isapi no longer stops configure in non-zts mode, look for _debug for debug libraries when debug is enabled 2008-05-14 03:13:17 +00:00
Elizabeth Marie Smith
ba02e9ae64 These are really old config.w32 files - now they use PHP_PHP_BUILD correctly instead of hard coding the path to the libraries 2008-04-15 16:55:53 +00:00
Dmitry Stogov
ba8e3174ce Optimized request startup sequence for php.ini without per dir and per host configurations 2008-04-15 11:31:58 +00:00
Dmitry Stogov
9412a49006 Fixed bug #44673 (With CGI argv/argc starts from arguments, not from script) 2008-04-09 09:16:51 +00:00
Antony Dovgal
b021e04c0e MFH: fix test 2008-04-07 12:14:04 +00:00
Dmitry Stogov
9e4d03885e - Fixed possible stack buffer overflow in FastCGI SAPI. (Andrey Nigmatulin)
- Fixed sending of uninitialized paddings which may contain some information.
  (Andrey Nigmatulin)
2008-04-03 10:24:58 +00:00
Felipe Pena
3230a77d89 MFB: Fixed bug #44564 (escapeshellarg removes UTF-8 multi-byte characters) 2008-03-30 12:24:10 +00:00
Marcus Boerger
7916f1c1f0 MFH:
- Fix memory leak found by Osman
- Merge strlen to sizof change from CLI
2008-03-25 22:05:22 +00:00
Marcus Boerger
c0b4683661 - MFH Use sizeof rather than strlen and cleanup 2008-03-25 21:58:29 +00:00
Rasmus Lerdorf
6ef4d75c81 Typo (I wonder if anybody would ever have noticed this) 2008-03-19 16:28:46 +00:00
Rasmus Lerdorf
45e327a672 Add new empty child terminate sapi hook to the rest of the sapis 2008-03-18 22:23:21 +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
Dmitry Stogov
8c885b8913 Implemented concept of "delayed early binding" that allows opcode caches to perform class declaration (early and/or run-time binding) in exactly the same order as vanila php.
The following pseudo-code explains how it should be used in opcode cache.

function cache_compile_file($filename) {
        if (!is_cached($filename)) {
                ...
                orig_compiler_options = CG(compiler_optins);
                CG(compiler_options) |= ZEND_COMPILE_IGNORE_INTERNAL_CLASSES |
                                        ZEND_COMPILE_DELAYED_BINDING;
                $op_array = orig_compile_file($filename);
                CG(compiler_options) = orig_copiler_options;
                ...
        } else {
                $op_array = restore_from_cache($filename);
        }
        zend_do_delayed_early_binding($op_array);
}
2008-03-18 08:36:30 +00:00
Rasmus Lerdorf
42d4cf6531 Revert
Never mind, it looks like ext/filter does an estrdup on everything it
gets which doesn't seem very efficient to me as most things it gets
passed will already be emalloc'ed.  My custom version of the filter
extension doesn't do this which led to the confusion.
2008-03-17 18:27:08 +00:00
Rasmus Lerdorf
bafb0b4ff5 We need to pass PHP-managed pointers to filter here to avoid having
emalloc'ed data assigned to things like r->uri and having it get efree()'ed
on request shutdown which then means that if the Apache logging module
tries to log r->uri it would be reading from free'ed memory.  So a simple
estrdup before the filter call takes care of that.
2008-03-17 18:03:31 +00:00
Nuno Lopes
37660519cb fix tests (removed duplicated stuff) 2008-03-17 16:32:15 +00:00
Antony Dovgal
964e0522a1 fix test 2008-03-17 14:05:39 +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
Lars Strojny
698e065295 Adding itk again to non-threaded MPMs. Sorry for the confusion 2008-03-11 22:47:39 +00:00
Felipe Pena
84a8bb038a MFH: New way for check void parameters 2008-03-10 22:15:36 +00:00
Felipe Pena
5d9e462ecf Fix typo (#44381) 2008-03-09 16:07:14 +00:00
Lars Strojny
a344adf72e sapi/apache2(handler|filter)/config.m4: Removing itk from the list of threaded MPMs (thanks Hannes) 2008-03-09 12:35:56 +00:00
Lars Strojny
1b16b4e243 Adding itk and and peruser MPM to the list of threaded Apache MPMs 2008-03-09 01:10:25 +00:00
Felipe Pena
8acaf4118c Fix test (new constant was added in PREG) 2008-03-08 23:06:42 +00:00
Johannes Schlüter
278b7f2bdd - MFH: New tests 2008-03-07 21:33:17 +00:00
Johannes Schlüter
95623a1d70 MFH: New tests 2008-03-01 21:55:38 +00:00
Antony Dovgal
01fa5a782b MFH 2008-02-28 09:18:13 +00:00
Ilia Alshanetsky
183267dc29 MFB: Fixed security issue detailed in CVE-2008-0599 2008-02-28 00:51:56 +00:00
Dmitry Stogov
f27c1b9d07 optimization 2008-02-15 14:45:42 +00:00
Marcus Boerger
0ebb904bbb - Small improvements, no malloc needed for the zval 2008-02-03 17:49:46 +00:00
Dmitry Stogov
240fa244c3 Improved PHP binary size and startup speed with GCC4 visibility control (Nuno) 2008-01-30 09:41:12 +00:00
Dmitry Stogov
8cab54a897 Fixed bug #43968 (Extending internal class causes a crash)
The fix is a workaround for GCC optizer bug.
2008-01-29 20:01:31 +00:00
Antony Dovgal
9a16d91117 fix test
Derick, you're adding new methods too fast =)
2008-01-29 12:23:48 +00:00
Hannes Magnusson
bb9fa509fe Fix test 2008-01-27 19:10:41 +00:00
Ilia Alshanetsky
1227a4c57a Fixed bug #42779 (Incorrect forcing from HTTP/1.0 request to HTTP/1.1
response)
2008-01-16 15:49:46 +00:00
Ilia Alshanetsky
f94d19ffea Fixed test 2008-01-13 17:23:14 +00:00
Ilia Alshanetsky
93264ecc32 Update copyright 2008-01-01 18:30:20 +00:00
Ilia Alshanetsky
79e02d8786 Update copyright 2007-12-31 21:34:42 +00:00
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Antony Dovgal
996e245143 fix test 2007-12-15 12:46:22 +00:00
Dmitry Stogov
c34a2574be The -f option is fixed to work in the same way as in CLI sapi 2007-12-03 09:38:12 +00:00
Jani Taskinen
02d966c263 MFH:- Added support for [HOST=www.example.com] special sections
MFH:- Allowed using full path to load modules using "extension" directive
2007-11-09 16:27:43 +00:00
Antony Dovgal
46c08f53d7 fix tests 2007-11-01 12:55:42 +00:00
Dmitry Stogov
a1d37c3c7f Fixed bug #42848 (Status: header incorrect under FastCGI) 2007-11-01 11:12:33 +00:00
Dmitry Stogov
df96b455d4 Added check for HAVE_GETTIMEOFDAY 2007-10-26 04:46:12 +00:00
Jani Taskinen
9942f30a38 MFH: ws 2007-10-25 10:01:30 +00:00
Dmitry Stogov
6f7b738b71 Added CGI SAPI -T option, to measure execution time of script repeated several times. 2007-10-25 05:39:06 +00:00
Rob Richards
c4575f4c4b MFH: fix win build 2007-10-05 16:00:30 +00:00
Jani Taskinen
aa3eee1dce MFH:- Moved the old regex functions to own extension: ereg 2007-10-05 15:00:09 +00:00
Jani Taskinen
2bc631fb40 MFH:- Added common getopt implementation to core.
MFH:- Added long-option feature to getopt().
MFH:- Made getopt() available on win32 systems.
MFH:  Patch by: David Soria Parra <dsp@php.net>
[DOC]: These changes will be available from 5.3+

# Note: Fixed also tests and synced basic_functions.c with HEAD.
2007-10-01 12:40:54 +00:00
Nuno Lopes
e029a0ee59 fix a few compiler warnings (mostly use of unitialized values) 2007-09-29 11:18:42 +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
Jani Taskinen
0d3bdf23d2 MFH: ws + cs 2007-09-27 22:09:46 +00:00
Dmitry Stogov
6c810b0d4c Improved memory usage by movig constants to read only memory. (Dmitry, Pierre) 2007-09-27 18:00:48 +00:00
Dmitry Stogov
06f43b30c1 MFH: Improved and cleaned CGI code. FastCGI is now always enabled and can not be disabled. See sapi/cgi/CHANGES for more details. 2007-09-27 08:23:58 +00:00
Dmitry Stogov
b441b275b3 Fixed bug #42699 (PHP_SELF duplicates path) 2007-09-24 11:40:05 +00:00
Dmitry Stogov
96810f0ae6 Fixed bug #42587 (behaviour change regarding symlinked .php files) 2007-09-10 10:55:26 +00:00
Jani Taskinen
fef2b33e85 MFH:- Fixed bug #42579 (apache_reset_timeout() does not exist) 2007-09-07 08:49:24 +00:00
Dmitry Stogov
dd8c8d05e8 Added checks for malformated FastCGI requests (Mattias Bengtsson) 2007-09-07 08:26:47 +00:00
Dmitry Stogov
5d238efaa6 Fixed bug #42523 (PHP_SELF duplicates path) 2007-09-05 08:26:32 +00:00
Dmitry Stogov
39bceffc4a Fixed bug #42453 (CGI SAPI does not shut down cleanly with -i/-m/-v cmdline options) 2007-08-31 12:17:52 +00:00
Stanislav Malyshev
50293835bf remove unneeded variables 2007-08-08 23:51:57 +00:00
Stanislav Malyshev
45e907a0ee fix startup - remove unneeded variables 2007-08-08 21:57:30 +00:00
Stanislav Malyshev
1e7a23a376 initialize values 2007-08-08 21:11:53 +00:00
Stanislav Malyshev
6c8312fa03 fix TSRM embed startup 2007-08-08 21:06:28 +00:00
Dmitry Stogov
50aef7ec83 - Fixed bug #42198 (SCRIPT_NAME and PHP_SELF truncated when inside a userdir
and using PATH_INFO).
- Fixed bug #31892 (PHP_SELF incorrect without cgi.fix_pathinfo, but turning
  on screws up PATH_INFO).
2007-08-08 13:01:40 +00:00
Jani Taskinen
9c07366bb0 MFH: fix typos in comments 2007-08-08 10:00:34 +00:00
Antony Dovgal
83e7324dae fix build 2007-08-06 12:54:57 +00:00