Commit Graph

2052 Commits

Author SHA1 Message Date
Pierre Joye
c6f6997504 - fix build 2009-01-04 20:18:57 +00:00
Marcus Boerger
2aba368462 - MFH Catch exceptions in cli -a 2009-01-02 13:14:49 +00:00
Hannes Magnusson
1ceaa1de72 Nuke unused variables 2008-12-31 14:45:14 +00:00
Marcus Boerger
f77719d800 MFH
- Changed dl() to be disabled by default. Enabled only when explicitly
  registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. (Dmitry)
[DOC]
2008-12-31 14:27:09 +00:00
Marcus Boerger
8bdeb10a08 - MFH Fix test 2008-12-31 12:33:12 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Stanislav Malyshev
40cd1d49b3 MFH fix #46005 2008-12-17 11:34:50 +00:00
Pierre Joye
cd57fe323d - WS 2008-12-11 10:22:12 +00:00
Pierre Joye
38b1e4c702 - ws 2008-12-11 00:13:48 +00:00
Matt Wilmas
a31c7ebdff MFH: Fixed bug #46782 (fastcgi.c parse error) 2008-12-07 10:55:16 +00:00
Uwe Schindler
f24ac1603c remove unneeded includes (not needed since NSAPI 3.0, wich is very old). This is needed for cleanup of the windows build. 2008-12-01 10:11:09 +00:00
Uwe Schindler
482d167a77 MFH: support stat cache of webserver (like apache does) 2008-11-29 23:44:08 +00:00
Uwe Schindler
0bcf89e266 MFH: Some nsapi.h specific ifdefs unified & corrected 2008-11-29 19:57:49 +00:00
Uwe Schindler
7db781fc1b MFH: remove one stat call and replace by cached one 2008-11-29 19:37:06 +00:00
Uwe Schindler
321b1b6884 MFH:
- Implement the changes needed for http://news.php.net/php.cvs/54228
- Additionally implement flushing in NSAPI and fix some small things
2008-11-29 14:45:51 +00:00
Stanislav Malyshev
09e37bc5ed MFB: init server context before config variables are processed 2008-11-29 00:45:31 +00:00
Dmitry Stogov
c5c9e45af9 Fixed bug #46366 (bad cwd with / as pathinfo) 2008-11-28 11:57:02 +00:00
Arnaud Le Blanc
cc2c720912 MFH: Fixed endless loop in cli when ignore_user_abort is on 2008-11-25 03:52:00 +00:00
Stanislav Malyshev
281676da26 MFB: fix php_value application order for Apache 2008-11-24 22:23:11 +00:00
Alexey Zakhlestin
202426a1fb new parameter-parsing api 2008-11-18 19:07:47 +00:00
Felipe Pena
fc2fb50d09 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-11-17 11:28:01 +00:00
Arnaud Le Blanc
aaaf67e19e Updated header_handler in apache2filter and apache_hooks 2008-11-13 13:41:08 +00:00
Arnaud Le Blanc
8c4151ad72 Added header_remove() (chsc at peytz dotdk, Arnaud)
[DOC] proto void header_remove([string header_name])
      Removes an HTTP header previously set using header()
      The header_name parameter is optionnal, all headers are
      removed if it is not set

[SAPIs] The header_handler callback in sapi_module_struct has
           been changed, it now take a new argument.

           When it is set to SAPI_HEADER_DELETE, sapi_header->header is
           the name of an header, header_handler has to delete it.

           When it is set to SAPI_HEADER_DELETE_ALL, header_handler has
           to delete all headers.

           When sapi_header_op_enum is SAPI_HEADER_ADD or _REPLACE,
           sapi_header->header is in the form "Name: value", header_handler
           has to add or replace the given header.

           In all cases, header_handler must not free sapi_header or
           sapi_header->header. SAPI_HEADER_ADD must be returned if the
           header has been added or replaced, or 0 in other cases.
2008-11-13 10:14:04 +00:00
Rasmus Lerdorf
f121e72ac7 Fix for bug #46525 2008-11-08 22:56:17 +00:00
Alexey Zakhlestin
f9d86cf9d3 new parameter-parsing API 2008-11-07 13:28:23 +00:00
Arnaud Le Blanc
9b0d76d585 Open STDIN and php://stdin streams with the relevant
wrapper when the file descriptor is a socket (inetd, etc)
Fixes bug #43731
2008-11-04 21:05:31 +00:00
Felipe Pena
7a37fa2d6b - Revert ZEND_BEGIN_ARG_INFO change 2008-11-02 21:19:39 +00:00
Felipe Pena
8fa119a6f6 - MFH: Fixed bug #46382 (Mismatching allocation and deallocation in stresstest.cpp) (dvice_null at yahoo dot com) 2008-10-24 23:16:46 +00:00
Felipe Pena
cc9a286005 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-10-24 16:03:15 +00:00
Arnaud Le Blanc
e3c556c85e MFH: Fixed FCGI_GET_VALUES requests (fixes #45522) 2008-10-21 03:19:28 +00:00
Ilia Alshanetsky
e45af91313 Fixed bug #46319 (PHP sets default Content-Type header for HTTP 304 response
code, in cgi sapi)
2008-10-17 01:31:12 +00:00
Rob Richards
a16bcaeb4b MFH: use getenv 2008-09-30 15:11:05 +00:00
George Wang
ffe4bd566f *** empty log message *** 2008-09-21 02:38:32 +00:00
George Wang
0f4f00e3ae disable core dump by default 2008-09-21 02:34:08 +00:00
Dmitry Stogov
51eb7f5de9 Fixed bug #45860 (header() function fails to correctly replace all Status lines) 2008-09-02 13:22:16 +00:00
Dmitry Stogov
762d6706d3 Fixed bug #42318 (problem with nm on AIX, not finding object files) 2008-09-01 13:15:31 +00:00
Marcus Boerger
3dadcee60b - MFH Fix test 2008-08-30 11:32:29 +00:00
George Wang
f091e745c9 ignore signal SIGXFSZ 2008-08-26 22:05:17 +00:00
Alexey Zakhlestin
e7eba5af6a switch to the new parameter-parse API 2008-08-26 17:34:16 +00:00
Rasmus Lerdorf
421751d240 Remove stray folding tag here 2008-08-26 15:37:01 +00:00
Dmitry Stogov
ced680941a Fixed bug #45786 (FastCGI process exited unexpectedly) 2008-08-26 09:56:08 +00:00
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