Commit Graph

548 Commits

Author SHA1 Message Date
Jani Taskinen
dad7c68b27 - Fix test 2009-07-25 00:35:25 +00:00
Pierre Joye
a7db554314 - #48624 .user.ini never gets parsed 2009-06-22 14:10:40 +00:00
Pierre Joye
6086c0866c - kill unused var 2009-06-17 19:28:52 +00:00
Pierre Joye
f2457fbd56 - #47318, UMR when trying to activate user config 2009-06-17 19:22:24 +00:00
David Soria Parra
368569c05b MFH: Fix bug #47042 (cgi sapi is incorrectly removing the SCRIPT_FILENAME for non apache).
The fix was provided by Sriram Natarajan.
2009-06-09 13:31:39 +00:00
Jani Taskinen
a332541aaa MFH:- Fixed bug #48419 (non-portable STDIN fileno in cgi_main.c) 2009-06-04 11:51:43 +00:00
Jani Taskinen
29c0b397ec MFH: CS + WS changes 2009-06-04 11:47:27 +00:00
Kalle Sommer Nielsen
01fc4ed1d6 MFH: Fix compiler warnings 2009-05-19 16:03:36 +00:00
Arnaud Le Blanc
a772d7c3ef MFH 2009-04-24 19:48:41 +00:00
David Soria Parra
65e3d00366 MFH: Fix #47149. Remove check for script_filename = path_translated, as this the actual value that we get from apache. 2009-01-19 18:17:32 +00:00
Dmitry Stogov
828566dafb Disable dl() in CGI and FastCGI modes 2009-01-11 08:35:36 +00:00
David Soria Parra
544150aef8 MFH: Fixed bug #47042 (PHP cgi sapi is removing SCRIPT_FILENAME for non apache). 2009-01-09 22:13:55 +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
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +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
Dmitry Stogov
c5c9e45af9 Fixed bug #46366 (bad cwd with / as pathinfo) 2008-11-28 11:57:02 +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
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
Dmitry Stogov
51eb7f5de9 Fixed bug #45860 (header() function fails to correctly replace all Status lines) 2008-09-02 13:22: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
Jani Taskinen
e5e6f553a2 MFH 2008-08-13 00:53:28 +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
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
Dmitry Stogov
8054f84a3c Fixed possible buffer overflow 2008-06-23 11:37:50 +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
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
Rasmus Lerdorf
45e327a672 Add new empty child terminate sapi hook to the rest of the sapis 2008-03-18 22:23:21 +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
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
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
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +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
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
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
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
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
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
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
Dmitry Stogov
3a5501e0d4 ECONNABORTED is not a critical error (Andrei Nigmatulin) 2007-07-09 11:48:39 +00:00
foobar
7ed3c4536d MFH: Fix some configure --help texts 2007-07-03 17:25:43 +00:00
Dmitry Stogov
e5909f149c Fixed bug #40419 (Trailing Slash in CGI request don't work) 2007-06-26 14:47:16 +00:00
Dmitry Stogov
5d2180835a no need to return exit status of the last fastcgi request 2007-06-21 08:40:43 +00:00
Antony Dovgal
5c75e5b4f4 MFH: add missing open_basedir checks to CGI 2007-06-04 15:38:12 +00:00
foobar
ca1b7e7b47 fix test 2007-06-03 22:50:19 +00:00
Dmitry Stogov
e35679618e Removed deprecated comment 2007-05-28 08:11:59 +00:00
Antony Dovgal
ccd16d09c0 MFH 2007-05-27 19:23:09 +00:00
foobar
a894611636 - Unify installation of SAPIs: CGI is no exception anymore. 2007-05-24 23:29:59 +00:00
Dmitry Stogov
23409a4bbf Fixed crash on "php -b 1234 -unknown-option" 2007-05-21 09:08:13 +00:00
Dmitry Stogov
3040a34b21 libfcgi cleanup (Andrei Nigmatulin) 2007-05-21 08:47:51 +00:00
Ilia Alshanetsky
30dd6a45d3 Fixed a possible crash when PATH_INFO is not provided but the path contains
path info information
2007-05-20 15:56:10 +00:00
Dmitry Stogov
633aff5541 Fixed bug #41378 (fastcgi protocol lacks support for Reason-Phrase in "Status:" header) 2007-05-15 08:17:08 +00:00
Dmitry Stogov
6e8438633b Fixed bug #41291 (FastCGI does not set SO_REUSEADDR). (fmajid at kefta dot com) 2007-05-10 15:21:02 +00:00
Antony Dovgal
a10cd19d05 MFH: fix long options 2007-04-23 11:05:16 +00:00
Marcus Boerger
f62d5c9adf - MFH getopt fixes 2007-04-22 15:31:16 +00:00
Antony Dovgal
695e81c2cc fix test 2007-04-17 20:17:25 +00:00
foobar
4f54b301ef - Fix a possible leak when multiple -c parameters are used 2007-04-17 20:00:53 +00:00
Antony Dovgal
a0370cd797 add tests for CGI 2007-04-17 19:49:26 +00:00
Antony Dovgal
44066f23b7 MFH: fix leak appearing when more than one -f option specified 2007-04-17 18:51:34 +00:00
foobar
2fe7267d53 MFH: Simplify previous patch. 2007-04-15 23:06:08 +00:00
foobar
a40b6f5c4f - Allow using syntax highlighting under FastCGI mode. 2007-04-15 22:52:07 +00:00
foobar
c71b1401ff - Synch these files from sapi/cli/ and allow using s.c. long-options
with CGI.
2007-04-15 22:50:58 +00:00
Dmitry Stogov
857f992cd3 Removed wrong size_t definition 2007-04-09 15:39:59 +00:00
Sara Golemon
52b07d1895 Add missing #if check 2007-03-29 18:47:04 +00:00
Dmitry Stogov
4a119f9a79 Improved FastCGI SAPI to support external pipe and socket servers on win32 2007-03-28 15:39:22 +00:00
Dmitry Stogov
1e13ef2de5 Fixed compilation warning 2007-03-12 07:39:01 +00:00
Dmitry Stogov
c2a71f8eb1 Return HTTP 403 in case of "access denied". 2007-03-09 16:46:07 +00:00
Ilia Alshanetsky
efad70c2cc snprintf() -> slprintf() 2007-02-27 03:28:17 +00:00
Dmitry Stogov
94d7b8b004 poll() is not affected by FD_SETSIZE (Tony) 2007-02-26 09:38:44 +00:00
Dmitry Stogov
0caa2be91f Use poll() instead of select() if available 2007-02-24 11:20:43 +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
Dmitry Stogov
2b5e7d315f Check for FD_SETSIZE limit 2007-02-21 15:46:13 +00:00
Antony Dovgal
43d788ec33 MFH: move PHP_TEST_WRITE_STDOUT to acinclude.m4 and use it in configure.in 2007-02-20 20:11:11 +00:00
Antony Dovgal
748b6fdeb3 MFH: make use of startup hooks 2007-02-20 19:20:41 +00:00
Ilia Alshanetsky
9ae588dfb1 Fixed strlcat() usage.
# Thanks Andi
2007-02-19 23:52:13 +00:00
Dmitry Stogov
2a170f0584 Initialize "retval" on each request 2007-02-19 14:13:02 +00:00