Commit Graph

2306 Commits

Author SHA1 Message Date
Raphael Geissert
bce8aae080 Document CGI options in the manpage (bug #51718)
Patch by Daniel Egeberg
2010-05-11 15:07:31 +00:00
Jérôme Loyet
ef9ea5f967 Fix #51736, wrong checks on dynamic parameters 2010-05-08 08:52:32 +00:00
Rob Richards
60f62fc563 fix non-windows builds 2010-05-04 12:12:28 +00:00
Pierre Joye
56e327ba27 - revert fix for #51723 in 5.2, vc6 does not support strtoi64, use builtin functioon in 5.3 (trunk is vc9+ only) 2010-05-03 19:51:59 +00:00
Pierre Joye
d90f8560aa - #51273, Content-length header is limited to 32bit integer with apache2/windows 2010-05-03 17:47:58 +00:00
Pierre Joye
9720dea2c7 - WS 2010-05-03 14:30:14 +00:00
Antony Dovgal
47aa194a10 merge the fix for #51688 2010-04-30 08:20:57 +00:00
Pierre Joye
8a197878c8 - Fix #51688, ini per dir crashes when invalid document root are given 2010-04-30 08:15:09 +00:00
Rob Richards
0a34d10783 revert change #298288: Remove old dsp/dsw/makefile files 2010-04-28 14:41:51 +00:00
Kalle Sommer Nielsen
dd8e59da8f Removed safe_mode
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
2010-04-26 23:53:30 +00:00
Jérôme Loyet
34ba9e39fa Add PHP_VALUE and PHP_ADMIN_VALUE interpretation from fastcgi headers.
It works as php_value and php_admin_value from the main conf file or apache sapi.

See bug (request) #51595
2010-04-23 16:05:52 +00:00
Jérôme Loyet
acf5fba0fb Remove unused functions / variables / #if 0 blocks 2010-04-23 15:09:28 +00:00
Jérôme Loyet
757d7ace9a typo 2010-04-23 13:56:14 +00:00
Jérôme Loyet
0b2a196431 typo and errors in php-fpm.conf 2010-04-23 08:06:49 +00:00
Jérôme Loyet
7ac145d9f3 correct wrong comparison (thx to felipe) 2010-04-22 07:14:06 +00:00
Kalle Sommer Nielsen
518a17e7bf Remove old dsp/dsw/makefile files, these arent used by the build system anymore and are barely updated nor available for all extensions 2010-04-21 23:36:49 +00:00
Felipe Pena
696f6c7c93 - Fix ZTS build 2010-04-21 23:22:20 +00:00
Jérôme Loyet
3defa292f2 switch the configuration syntax from xml to ini
It's been describe in the RFC: http://wiki.php.net/rfc/fpm/ini_syntax
2010-04-21 22:56:33 +00:00
Kalle Sommer Nielsen
febee11285 Removed register_globals 2010-04-21 01:27:22 +00:00
Jérôme Loyet
bae9248602 typo 2010-04-20 23:31:13 +00:00
Jérôme Loyet
5556956899 Add a check request_method. If fcgi protocol is not followed, a segfault can occur. 2010-04-20 23:28:20 +00:00
Jérôme Loyet
ca8756478a Change php_defines in configuration file to php_value,php_admin_value,php_flag,php_admin_flag (as in the apache sapi).
php_admin* sets values as ZEND_INI_SYSTEM mode while php_* sets values as ZEND_INI_USER
2010-04-20 21:13:40 +00:00
Jérôme Loyet
213436c3fb true/false was not a valid value for boolean directives 2010-04-19 20:45:03 +00:00
Jérôme Loyet
5a211da7af correct path in the man page 2010-04-19 18:02:36 +00:00
Antony Dovgal
b299e90b79 use new type + const static 2010-04-13 12:16:26 +00:00
Antony Dovgal
d77d6153ec re-add updated FPM 2010-04-13 12:13:46 +00:00
Antony Dovgal
3ebdadf8f6 prepare to re-add newer FPM version 2010-04-13 12:13:24 +00:00
Kalle Sommer Nielsen
7ef4cdf471 Remove a couple TSRMLS_FETCH() calls around ext/main/sapi 2010-04-13 11:02:15 +00:00
Antony Dovgal
06b9943842 add FPM sapi to trunk 2010-04-12 11:22:24 +00:00
Johannes Schlüter
26af575926 Add ReflectionZendExtension class and --rz option to CLI 2010-03-30 22:35:23 +00:00
Jani Taskinen
af49e58f51 - Reverted r296062 and r296065 2010-03-12 10:28:59 +00:00
Jani Taskinen
06f072cb5e MFH: Improved / fixed output buffering (Michael Wallner) 2010-03-11 10:24:29 +00:00
Felipe Pena
68f805a6d0 - Fixed bug #51237 (milter SAPI crash on startup)
patch by: igmar at palsenberg dot com
2010-03-08 23:29:46 +00:00
Felipe Pena
9186e478fa - Fix php-milter sample usage (-r option doesn't exists here) 2010-03-08 22:58:31 +00:00
Kalle Sommer Nielsen
bf7de28e46 Fixed bug #50795 (man pages have bad whatis entries)
- Patch by Debian
2010-02-17 05:32:52 +00:00
Rasmus Lerdorf
1947334023 Fix bug #50940 2010-02-05 18:59:05 +00:00
Ilia Alshanetsky
8543914732 Update copyright year in the man file 2010-01-04 12:38:07 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Antony Dovgal
6a9d78f102 fix minor leak in CGI sapi (happened once per child) 2009-12-23 09:40:28 +00:00
Felipe Pena
4411621217 - Fixed bug #50209 (Compiling with libedit cannot find readline.h)
(patch by tcallawa at redhat dot com)
2009-12-13 17:06:47 +00:00
Jani Taskinen
c4819e9ff3 MFH: static before const 2009-12-08 17:30:22 +00:00
Jani Taskinen
4944354eec - Sync files 2009-12-02 08:22:05 +00:00
Dmitry Stogov
b26c9d400d Fixed bug #50168 (FastCGI fails with wrong error on HEAD request to non-existant file) 2009-11-30 14:43:22 +00:00
Jani Taskinen
bf7ed5eff5 - Fixed bug #49677 (ini parser crashes with apache2 and using ${something} ini variables) 2009-11-25 12:35:42 +00:00
Jani Taskinen
afc44b981e ws 2009-11-25 12:26:10 +00:00
Uwe Schindler
bdef3ee350 Fix bug #50140: With default compilation option, php symbols are unresolved for nsapi 2009-11-17 21:17:49 +00:00
Uwe Schindler
d80507b7d9 As I am working on it, further improvement for bug #50087 2009-11-12 17:13:05 +00:00
Uwe Schindler
47189cac7b Fix bug #50087: NSAPI performance improvements 2009-11-12 15:19:35 +00:00
Antony Dovgal
f298e6ce6e fix crash on empty doc_root 2009-10-20 12:57:44 +00:00
Stanislav Malyshev
a226082475 improve fix for #49767 and #47627 - make PHP report
"no script" on 404 again
2009-10-16 23:34:31 +00:00
Pierre Joye
e4adfe4f61 - #48779, fix another use case where / usage may differ 2009-10-15 13:09:25 +00:00
Pierre Joye
e5d4b019b9 - #48779, improve fix, drop usage of _tolower and use zend_strtolower 2009-10-12 14:40:27 +00:00
Felipe Pena
994307d429 - Fixed build and comment-style 2009-10-09 20:01:16 +00:00
Garrett Serack
8e5a00e546 - changed ini file directives [PATH=](on Win32) and [HOST=](on all) to be case insensitive (garretts) 2009-10-09 19:43:00 +00:00
Ilia Alshanetsky
9e76501f1e Fixed test 2009-09-13 13:14:11 +00:00
Jani Taskinen
ccd6e501d1 - Simplified a bit and fixed possible memory corruption and definate leak. 2009-09-10 16:19:42 +00:00
Felipe Pena
5c9579c27f - Drop unused var 2009-09-05 18:22:16 +00:00
Jani Taskinen
f723d368b3 - Fixed bug #49182 (PHP CGI always outputs the shebang line) 2009-09-05 17:07:14 +00:00
Pierre Joye
4417646d72 - be sure to get all crt dbg errors in stderr 2009-09-02 20:02:17 +00:00
Pierre Joye
48d031aa6e - fix build 2009-08-26 19:17:32 +00:00
Ilia Alshanetsky
19f11e401d Fixed variable clobbering 2009-08-26 15:29:06 +00:00
Uwe Schindler
847f637497 MFH: Fix bug #46020: With Sun Java System Web Server 7.0 on HPUX, #define HPUX 2009-08-03 10:13:49 +00:00
Garrett Serack
f56d6b67b5 - Updated fix for bug #48911 (embed sapi misses SAPI_API)
#- Windows didn't need SAPI_API
2009-07-30 20:20:56 +00:00
Jani Taskinen
907763a20a - Fixed bug #48911 (embed sapi misses SAPI_API) 2009-07-28 21:07:43 +00:00
Jani Taskinen
555b177c83 - Fix this again :) 2009-07-25 21:07:02 +00:00
Jani Taskinen
dad7c68b27 - Fix test 2009-07-25 00:35:25 +00:00
Jani Taskinen
6dc86facd0 - Fixed bug #48802 (printf() returns incorrect outputted length) 2009-07-23 14:54:04 +00:00
Johannes Schlüter
d4671b904d Improve wording and drop outdated link 2009-06-29 09:37:06 +00:00
Pierre Joye
a7db554314 - #48624 .user.ini never gets parsed 2009-06-22 14:10:40 +00:00
Johannes Schlüter
47be72139d MFH: It's 2009 2009-06-21 16:44:50 +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
Matt Wilmas
d55300298e MFH: Added zend_eval_stringl and made create_function(), etc. binary-safe 2009-06-05 18:50:32 +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
Arnaud Le Blanc
6540730732 MFH: Fix skipif 2009-05-20 10:08:32 +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
Hannes Magnusson
e2576c3504 MFH: Inglés gramática 2009-04-09 10:20:02 +00:00
Hannes Magnusson
6cda8a274a MFH: Fixed bug#47427 (-s outputs, not displays) 2009-04-09 10:07:56 +00:00
Felipe Pena
844ae2f336 - MFH: Fix ZTS build 2009-04-08 00:15:48 +00:00
Arnaud Le Blanc
95b308949c MFH: Fixed bug #47893 (CLI aborts on non blocking stdout) 2009-04-07 16:11:19 +00:00
Kalle Sommer Nielsen
ec3649530f MFH: Fixed compiler warning 2009-03-30 14:24:16 +00:00
Uwe Schindler
0935ae193c MFH: Fix a sigsegv on server shutdown, add missing sapi_shutdown(). 2009-03-23 23:13:14 +00:00
Pierre Joye
afc5630357 - disable it when ZTS is disabled 2009-03-20 18:49:37 +00:00
Pierre Joye
39988315e0 - fix build 2009-03-16 10:13:18 +00:00
Pierre Joye
3612ddde16 - revert last commit (tree was not updated) 2009-03-16 10:08:51 +00:00
Pierre Joye
3091ece096 - fix vc6 build 2009-03-16 09:59:16 +00:00
Ilia Alshanetsky
5e09a71769 Adjust previous fix to avoid compiler warnings 2009-03-07 22:36:35 +00:00
Ilia Alshanetsky
9d3030d5f3 Improved parameter handling 2009-03-07 21:56:43 +00:00
George Wang
22badf88b0 make STDOUT function as STDERR, in case any module call print() 2009-02-27 23:33:01 +00:00
Pierre Joye
1eaca26ad8 - MFH: fix build (use the same arginfo than the aliased func) 2009-02-02 08:47:23 +00:00
Felipe Pena
e5f709d290 MFH:
- WS, CS
- Added missing param. checking
- Fixed type for 'l'
2009-01-30 14:38:12 +00:00
Ilia Alshanetsky
58a6bddf68 Improved parameter parsing 2009-01-27 21:59:30 +00:00
Scott MacVicar
390ccd899d MFH Fix apache2handler under Apache 2.3.0-alpha 2009-01-19 19:32:40 +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
Uwe Schindler
b70260d392 revert last commit, sizeof does not work in preprocessor :( 2009-01-11 13:47:01 +00:00
Uwe Schindler
4db4009c71 MFH: add sanity check for time_t size of win32 2009-01-11 13:39:39 +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
Ilia Alshanetsky
71ea95354b MFH: Corrected fix for bug #46844 to only trigger on the 1st line of CLI
opened files.
2009-01-09 17:21:12 +00:00
Uwe Schindler
3d4c47e2e5 MFH: the #ifdef was never working. If Sun extends its NSAPI to support subrequests, much of this code must be rewritten. Because of that it is better to have a clean start. This commit does not change behaviour. 2009-01-06 13:46:20 +00:00
Ilia Alshanetsky
f0240a0382 MFB: Improved parameter handling 2009-01-05 16:24:26 +00:00
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
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
Jani Taskinen
77f9d22a0e - Sync with apache2handler 2007-08-03 09:33:30 +00:00
Jani Taskinen
b8470c4ca0 ws 2007-08-03 09:33:17 +00:00
Jani Taskinen
fc2fef68ac - ws + sync apache2filter apache_config.c with the one from apache2handler 2007-08-03 09:32:34 +00:00
Stanislav Malyshev
c94dee8696 implement separate .htaccess stage 2007-08-03 01:14:44 +00:00
Stanislav Malyshev
f361b07629 use hardcoded ini like CLI 2007-08-02 23:45:28 +00:00