Scott MacVicar
56352d1a2f
MFB 5.3: Rest of the changes for re2c merge
2008-03-26 14:46:17 +00:00
Marcus Boerger
97781b818b
- Fix memory leak found by Osman
...
- Merge strlen to sizof change from CLI
2008-03-25 22:04:58 +00:00
Marcus Boerger
bd366b66da
- Use sizeof rather than strlen and cleanup
2008-03-25 21:58:03 +00:00
George Wang
a4213c5e63
catch up with the latest release
2008-03-19 22:43:25 +00:00
Felipe Pena
c2cc4c428e
Fixed test
2008-03-19 19:16:58 +00:00
Rasmus Lerdorf
b911467d1d
MFB
...
Here are the signal changes from the 5.3 branch that optimizes signal
handler registration and switches from longjmp to siglongjmp in order
to make signal mask handling consistent across different UNIX operating
systems.
2008-03-19 16:37:49 +00:00
Dmitry Stogov
ea9305c543
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:49 +00:00
Antony Dovgal
9d255b6f2f
fix test
2008-03-17 14:05:32 +00:00
Lars Strojny
a25b1f6d6d
Adding itk again to non-threaded MPMs. Sorry for the confusion
2008-03-11 22:50:41 +00:00
Felipe Pena
d2f4086e34
Fix typo ( #44381 )
2008-03-09 16:07:46 +00:00
Lars Strojny
7e63d1eb67
sapi/apache2(handler|filter)/config.m4: Removing itk from the list of threaded MPMs (thanks Hannes)
2008-03-09 12:37:05 +00:00
Lars Strojny
b15b1dcedd
Adding itk and and peruser MPM to the list of threaded Apache MPMs
2008-03-09 01:10:13 +00:00
Johannes Schlüter
421414f913
- New tests
2008-03-07 21:32:52 +00:00
Felipe Pena
2818d4fc51
New way for check void parameters
2008-03-04 23:39:15 +00:00
Johannes Schlüter
b3fc4f94cf
- New tests
2008-03-01 21:55:20 +00:00
Felipe Pena
187b9d27c0
Revert
2008-02-28 15:34:51 +00:00
Felipe Pena
748677148c
Fixed tests
2008-02-28 15:28:00 +00:00
Felipe Pena
a1e8d340c3
New macro for check void parameters
2008-02-28 14:16:25 +00:00
Antony Dovgal
cfcfbb24da
use pcre for testing reflection
2008-02-28 09:18:06 +00:00
Ilia Alshanetsky
9737e9ee3b
MFB: Fixed security issue detailed in CVE-2008-0599
2008-02-28 00:52:11 +00:00
Dmitry Stogov
965054d2f0
optimization
2008-02-15 14:51:52 +00:00
Marcus Boerger
8942024d3d
- MFB Sync
2008-02-03 17:50:06 +00:00
Dmitry Stogov
42a683d688
Imporoved PHP binary size and startup speed with GCC4 visibility control (Nuno)
2008-01-30 09:56:22 +00:00
Dmitry Stogov
3c02d2402d
Fixed bug #43968 (Extending internal class causes a crash)
...
The fix is a workaround for GCC optizer bug.
2008-01-29 20:01:43 +00:00
Antony Dovgal
87c9233d83
fix test
2008-01-29 12:27:49 +00:00
Hannes Magnusson
5bbb878db0
Fix test
2008-01-27 19:10:26 +00:00
Ilia Alshanetsky
ee3b0eefa6
MFB: Fixed bug #42779 (Incorrect forcing from HTTP/1.0 request to HTTP/1.1
...
response)
2008-01-16 15:50:53 +00:00
Ilia Alshanetsky
7129e68436
MFB: fixed test
2008-01-13 17:23:36 +00:00
Ilia Alshanetsky
6c945ee014
MFB: Update copyright
2008-01-01 18:30:59 +00:00
Sebastian Bergmann
3c94f05aea
MFB: Leftover: Bump copyright year.
2008-01-01 06:22:15 +00:00
Sebastian Bergmann
9b620d50b4
Bump copyright year, 2 of 2.
2007-12-31 07:12:20 +00:00
Antony Dovgal
b6da010f35
fix test
2007-12-15 12:44:21 +00:00
Dmitry Stogov
e54f02059e
The -f option is fixed to work in the same way as in CLI sapi
2007-12-03 09:38:25 +00:00
Jani Taskinen
ae2b2b1465
- Added support for [HOST=www.example.com] sections
...
# Works the same way as PATH, just the SERVER_NAME is matched with these
2007-11-09 16:02:50 +00:00
Antony Dovgal
5742cc19bb
MF53: fix tests
2007-11-01 14:12:39 +00:00
Dmitry Stogov
73e8a773fa
use slprintf()
2007-11-01 11:49:27 +00:00
Dmitry Stogov
dba5f202f0
Fixed bug #42848 (Status: header incorrect under FastCGI)
2007-11-01 11:13:06 +00:00
Dmitry Stogov
ffbbe893c9
Added check for HAVE_GETTIMEOFDAY
2007-10-26 04:46:28 +00:00
Jani Taskinen
3c85eea2cf
ws
2007-10-25 10:01:25 +00:00
Dmitry Stogov
896cdeee7a
Added CGI SAPI -T option, to measure execution time of script repeated several times.
2007-10-25 05:39:24 +00:00
Rob Richards
b9b4dd6d09
fix win build
2007-10-05 15:59:42 +00:00
Jani Taskinen
44cbb46246
- Added common getopt implementation to core.
...
- Added long-option feature to getopt().
- Made getopt() available on win32 systems.
Patch by: David Soria Parra <dsp@php.net>
[DOC]: These changes will be available from 5.3+
2007-10-01 12:32:39 +00:00
Nuno Lopes
b514dc1070
MFB: fix compiler warnings
2007-09-29 11:26:51 +00:00
Jani Taskinen
f964370a35
- 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)
@DOC Pierre promised to handle the manual part of this :D
2007-09-28 02:04:28 +00:00
Jani Taskinen
70abdbeef2
ws + cs fixes
2007-09-27 22:08:54 +00:00
Dmitry Stogov
8146078f7b
Improved memory usage by movig constants to read only memory. (Dmitry, Pierre)
2007-09-27 18:28:44 +00:00
Dmitry Stogov
fb5479c145
ws
2007-09-27 07:29:58 +00:00
Dmitry Stogov
4d9ca5ef3c
Fixed bug #42699 (PHP_SELF duplicates path)
2007-09-24 11:43:02 +00:00
Dmitry Stogov
c49d25c642
Fixed bug #42587 (behaviour change regarding symlinked .php files)
2007-09-10 10:55:41 +00:00
Antony Dovgal
eec31a3df3
output is started in php_module_startup(), no need to start it twice
...
fixes leaks in sapi/cgi/tests/005.phpt
2007-09-08 11:10:37 +00:00
Jani Taskinen
cf4bd5590b
- Fixed bug #42579 (apache_reset_timeout() does not exist)
2007-09-07 08:49:07 +00:00
Dmitry Stogov
1123fc8150
forgotten part
2007-09-07 08:42:33 +00:00
Dmitry Stogov
0507b17657
Added checks for malformated FastCGI requests (Mattias Bengtsson)
2007-09-07 08:30:10 +00:00
Dmitry Stogov
cbc9348dae
Fixed bug #42523 (PHP_SELF duplicates path)
2007-09-05 08:26:49 +00:00
Dmitry Stogov
98bb2b0d9e
Fixed bug #42453 (CGI SAPI does not shut down cleanly with -i/-m/-v cmdline options)
2007-08-31 12:18:04 +00:00
Stanislav Malyshev
c56929d6f1
remove unneeded variables
2007-08-08 23:56:19 +00:00
Stanislav Malyshev
4e105e0956
remove unneeded variables
2007-08-08 22:00:07 +00:00
Stanislav Malyshev
23d7755210
initialize variables
2007-08-08 21:14:11 +00:00
Stanislav Malyshev
6909aec23d
fix TSRM embed startup
2007-08-08 21:08:51 +00:00
Dmitry Stogov
b9163fe9de
- 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:02:01 +00:00
Jani Taskinen
f13d418d5d
- Fix typos in comments
2007-08-08 10:00:20 +00:00
Jani Taskinen
f4e24be3ed
Fix build
2007-08-06 18:14:13 +00:00
Antony Dovgal
5b47df1576
fix build
2007-08-06 17:01:17 +00:00
Antony Dovgal
b219df4b67
fix build
2007-08-06 12:54:35 +00:00
Jani Taskinen
18676754cf
MFB
2007-08-03 09:38:43 +00:00
Stanislav Malyshev
d4cc7daba2
MF5: fix for access control with .htaccess
2007-08-03 01:40:05 +00:00
Stanislav Malyshev
da2a2b5d68
use hardcoded INI like CLI
2007-08-02 23:49:50 +00:00
Antony Dovgal
7753ebafd1
fix win32 build
2007-07-16 19:02:43 +00:00
Jani Taskinen
7c44729e41
- Cleanup and simplify
2007-07-16 13:41:12 +00:00
Jani Taskinen
41c6375840
- Moved the old regex functions to it's own extension: ereg
2007-07-15 19:50:07 +00:00
Jani Taskinen
dee01c13ad
- Changed all AC_ARG_* options to PHP_ARG_* options and cleaned up some
2007-07-11 23:10:14 +00:00
Dmitry Stogov
aadb18c52f
ECONNABORTED is not a critical error (Andrei Nigmatulin)
2007-07-09 11:48:53 +00:00
Antony Dovgal
3eed8dfb76
fix crash on shutdown on Win32
...
patch by Scott
2007-06-28 17:22:56 +00:00
Dmitry Stogov
a5a98e6322
Fixed bug #40419 (Trailing Slash in CGI request don't work)
2007-06-26 14:47:33 +00:00
Dmitry Stogov
22527c8e03
no need to return exit status of the last fastcgi request
2007-06-21 08:40:56 +00:00
Scott MacVicar
91bcba1f1d
MFB: Fixed bug #41628 (PHP settings leak between Virtual Hosts in Apache 1.3).
2007-06-18 15:57:00 +00:00
Antony Dovgal
5697a11dd0
add missing open_basedir checks to CGI
2007-06-04 15:37:38 +00:00
foobar
55f2705c53
add missing test
2007-06-03 22:50:08 +00:00
foobar
1f6cf845b6
another missed ])
2007-06-03 21:57:31 +00:00
foobar
ffbb3aaf53
fix configure
2007-06-03 21:54:28 +00:00
foobar
6504c24187
- Fixed bug #41576 (misbehaviour when using --without-apxs)
2007-06-03 20:26:45 +00:00
foobar
2f51a4ec66
fix test
2007-06-01 22:19:20 +00:00
Antony Dovgal
b1a7a9f261
fix #39330 (apache2handler does not call shutdown actions before apache child die)
2007-06-01 10:02:41 +00:00
Ilia Alshanetsky
a21fe37d0e
MFB
2007-05-29 00:01:14 +00:00
Dmitry Stogov
397644d3ab
Removed deprecated comment
2007-05-28 08:12:11 +00:00
Antony Dovgal
c554b2fb41
"sapi/cgi/php" -> "sapi/cgi/php-cgi"
2007-05-27 19:22:24 +00:00
foobar
9112c17171
MFB:- Unify installation of SAPIs: CGI is no exception anymore.
2007-05-24 23:31:15 +00:00
Dmitry Stogov
e25fd7ad9b
Fixed crash on "php -b 1234 -unknown-option"
2007-05-21 09:08:25 +00:00
Dmitry Stogov
24bc130c56
Fixed bug #41378 (fastcgi protocol lacks support for Reason-Phrase in "Status:" header)
2007-05-15 08:17:20 +00:00
Dmitry Stogov
d009d41cb2
Fixed bug #41291 (FastCGI does not set SO_REUSEADDR). (fmajid at kefta dot com)
2007-05-10 15:22:15 +00:00
Johannes Schlüter
895a9fb212
- Fix build without reflection
...
# reflection_what is used fby --ri, too
2007-05-06 12:57:27 +00:00
Marcus Boerger
74e6d53ce4
- Fix function signature
2007-05-05 12:46:30 +00:00
Marcus Boerger
87041a3986
- Simplify/use consts
2007-05-05 12:09:21 +00:00
Marcus Boerger
c40640626b
- WS/CS
2007-05-04 22:09:30 +00:00
Edin Kadribasic
bb2519e6ab
MFB: Update Apache 2 libs to 2.0.59 on the build box and standardize the dirs
2007-05-04 18:19:37 +00:00
Uwe Schindler
218ce59478
Fix crash on server startup when log message is printed
2007-04-27 00:29:02 +00:00
Hannes Magnusson
02af1b4a65
rename --ri core to --ri main
...
# "the man has spoken"
2007-04-25 09:53:20 +00:00
Hannes Magnusson
64179171f8
Add the ability to display the core ini entries via "php --ri core"
2007-04-23 21:24:54 +00:00
Johannes Schlüter
9ee50fc95d
- Add my name (sync to CREDITS file)
2007-04-23 20:53:55 +00:00
Marcus Boerger
118fe71b72
- Rephrase as suggested by Chris Jones
2007-04-23 20:47:58 +00:00
Marcus Boerger
8e500e7749
- Add 'php --ini' to CLI which returns the INI file/dir configuration
2007-04-23 20:17:19 +00:00
Antony Dovgal
83d74b7488
fix long options
2007-04-23 11:04:54 +00:00
Marcus Boerger
0cf5184a1c
- Add new test
2007-04-22 15:29:20 +00:00
Marcus Boerger
223cd73da9
- Merge getopt fixes from re2c
2007-04-22 15:24:19 +00:00
Dmitry Stogov
ea86faafeb
Fixed tests
2007-04-19 07:00:57 +00:00
Antony Dovgal
83b3d8545e
fix test
2007-04-17 20:17:20 +00:00
foobar
c19178d966
MFB:- Fix a possible leak when multiple -c parameters are used
2007-04-17 20:01:22 +00:00
Antony Dovgal
2488b83ebe
add tests for CGI
2007-04-17 19:48:22 +00:00
foobar
c225e4a7d8
MFB
2007-04-17 19:48:16 +00:00
Antony Dovgal
b2f169ebf8
fix leak appearing when more than one -f option specified
2007-04-17 18:51:24 +00:00
foobar
0439662815
MFB: Allow using syntax highlighting in fastcgi mode
2007-04-15 23:02:05 +00:00
foobar
fd9af91146
MFB: sync getopt from CLI
2007-04-15 22:54:26 +00:00
Dmitry Stogov
2ebfb15089
Removed wrong size_t definition
2007-04-09 15:40:23 +00:00
Dmitry Stogov
072f7f1c60
Improved FastCGI SAPI to support external pipe and socket servers on win32
2007-03-28 15:39:35 +00:00
foobar
59e48ad26f
- Fixed test
2007-03-28 12:26:44 +00:00
Antony Dovgal
658743f7b9
fix #40392 (memory leaks in PHP milter SAPI)
...
we should have dropped this SAPI years ago
2007-03-28 10:06:54 +00:00
Johannes Schlüter
5dc2d0b0d6
- Fix handling of not existing long CLI options
2007-03-22 21:34:58 +00:00
Marcus Boerger
4d5ac8e9cf
- Fix issue with long form of command line switches
2007-03-21 23:19:00 +00:00
Antony Dovgal
29c4f0590c
fix tests
...
I was absolutely sure we removed --disable-reflection option.
2007-03-17 19:15:58 +00:00
Dmitry Stogov
3a4101c437
Fixed compilation warning
2007-03-12 07:39:24 +00:00
Dmitry Stogov
69ff1d0e4d
Return HTTP 403 in case of "access denied".
2007-03-09 16:50:17 +00:00
Uwe Schindler
4f370ac55f
Update function names for PHP6 to php6*
2007-03-06 19:47:12 +00:00
Uwe Schindler
7d9bf1d1cc
remove (large) static buffers for header names and request uri
2007-03-06 18:15:04 +00:00
Uwe Schindler
ff979699c9
use slprintf instead of snprintf and remove 0termination things (because slprintf is always available now)
2007-03-06 16:19:36 +00:00
Uwe Schindler
f8b7d0e046
snprintf patch
2007-03-05 16:28:39 +00:00
Dmitry Stogov
b915076031
poll() is not affected by FD_SETSIZE (Tony)
2007-02-26 09:39:08 +00:00
Marcus Boerger
20a40063c5
- avoid sprintf
2007-02-24 16:25:58 +00:00
Dmitry Stogov
10ffce3285
Use poll() instead of select() if available
2007-02-24 11:21:10 +00:00
Antony Dovgal
30239ea383
check for NULL, then add flag
2007-02-22 10:06:02 +00:00
Antony Dovgal
30dacafa72
implement PHP_STREAM_FLAG_NO_CLOSE and avoid hacks in plain wrapper
2007-02-21 21:56:45 +00:00
Dmitry Stogov
23ee3bf9bc
Check for FD_SETSIZE limit
2007-02-21 15:46:30 +00:00
Antony Dovgal
0f5b9e4e39
fix typo
2007-02-21 08:08:47 +00:00
Antony Dovgal
389e17332e
move PHP_TEST_WRITE_STDOUT to acinclude.m4 and use it in configure.in
...
its result is used in sapi/cli & sapi/embed, not just sapi/cgi
2007-02-20 20:10:53 +00:00
Antony Dovgal
2ad6c07ca1
don't call php_module_startup() directly, use startup functions
...
patch by Andrei Nigmatulin
2007-02-20 19:19:14 +00:00
Antony Dovgal
95741bd34a
MFB
2007-02-20 09:09:47 +00:00
Antony Dovgal
862523f69a
MFB: Eliminate strcat() usage
...
Fixed handling of argv[] for GET
2007-02-19 20:01:17 +00:00
Dmitry Stogov
bc873b7b1d
Initialize "retval" on each request
2007-02-19 14:13:35 +00:00
Dmitry Stogov
4de0758b91
Fixed fcgi_putenv() semantic with NULL value
2007-02-19 13:21:49 +00:00
Dmitry Stogov
32d7fd76a2
Fixed bug #40286 (PHP fastcgi with PHP_FCGI_CHILDREN don't kill children when parent is killed)
2007-02-16 11:30:38 +00:00
Dmitry Stogov
d57b78aab1
Fixed bug #40414 (possivle endless fork() loop when running fastcgi)
2007-02-15 12:33:54 +00:00
Dmitry Stogov
5ebba1b2f6
Fixed Bug #40352 (FCGI_WEB_SERVER_ADDRS function get lost)
2007-02-15 12:05:25 +00:00
Antony Dovgal
233ebb67e8
explicitly set module name
2007-02-07 18:22:38 +00:00
Antony Dovgal
a4f5b662a3
upgrade apache2filter to php6
2007-02-07 09:37:34 +00:00
Antony Dovgal
903ef1a071
change "php5" to "php6" everywhere
...
rename mod_php5.c to mod_php.c
2007-02-07 09:35:09 +00:00
Dmitry Stogov
68885b28dc
Prevent flush() of closed handle on php_module_shutdown()
2007-01-29 19:38:21 +00:00
Marcus Boerger
94292d3e01
- Add --ri/--rextinfo
2007-01-23 20:02:29 +00:00
Antony Dovgal
94f9dc1d8a
use getenv()
2007-01-20 22:12:45 +00:00
Andrei Zmievski
7963278bf4
Fake out the module name, since the filename is different now.
2007-01-11 23:18:11 +00:00
Andrei Zmievski
0b222980d0
Rename php5 module to php6. Remove version number from
...
sapi/apache/mod_php.* filenames (for future's sake). No other SAPI
moduels modified (up to invididual maintainers).
2007-01-10 23:46:09 +00:00
Johannes Schlüter
086ae075c2
- Bump year
2007-01-10 22:17:09 +00:00