mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-02 06:13:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,323 Commits 500 Branches 1,381 Tags 824 MiB
e2b0768e96
Commit Graph

244 Commits

Author SHA1 Message Date
Sterling Hughes
4565812470 fix windows build. 
#untested
 2001-05-16 18:10:06 +00:00
Zeev Suraski
260b4d0dbf Merge memory usage into memory limit 2001-05-16 15:02:30 +00:00
Daniel Beulshausen
e1a9871337 add missing apls_fetch 2001-05-16 09:01:20 +00:00
Zeev Suraski
d1845fb138 Move the initialization to a safer place (earlier, it could end up 
not being reset to 0 under certain circumstances)
 2001-05-15 14:55:42 +00:00
Daniel Beulshausen
0f60b4b8a5 fix typo 2001-05-14 10:30:30 +00:00
Zeev Suraski
0113263991 Safer detection of recursive PHP invocations 2001-05-13 09:03:46 +00:00
Sascha Schumann
afdaee9e47 Nuke more quotes 2001-05-12 11:09:05 +00:00
Thies C. Arntzen
169febcdf0 @- Added --enable-memory-usage-info. This creates a new Apache 1.x logging 
@  directive "{mod_php_memory_usage}n" which will log the peak amount of
@  memory used by the script. (Thies)
 2001-05-11 18:17:08 +00:00
Zeev Suraski
910e9d068c whitespace 2001-05-07 22:02:44 +00:00
Zeev Suraski
d229f82a46 Allow virtual() of PHP files. We may have to improve the detection code a 
bit, but it worked well on everything I tried.
 2001-05-07 11:07:22 +00:00
Sascha Schumann
d8b3bdf3bc Fix static Apache builds which were broken by the last commit. 2001-04-05 10:56:04 +00:00
Wilfredo Sanchez
cb71c4c2d0 Separate CPPFLAGS from CFLAGS. 2001-04-03 23:30:49 +00:00
Wilfredo Sanchez
0df6e8dd88 Add INSTALL_ROOT variable to specify install location. 2001-04-03 20:59:50 +00:00
foobar
8a26918ed1 Renamed the AC_ prefixed macros defined in acinclude.m4 to PHP_* prefixes. 
# Heads up people! I tested this before committing but you never know..
 2001-03-27 20:35:04 +00:00
Stanislav Malyshev
5c1f7a2f60 Fix off-by-one on config values set from Apache config 
# It didn't really hurt, since the extra character was always \0,
# but the phpinfo() display came out ugly.
 2001-03-13 18:39:38 +00:00
Zeev Suraski
800950c5a7 Avoid using ret uninitialized 2001-03-06 15:10:53 +00:00
Zeev Suraski
559c254f8f Avoid writing to error_log in case of aborted connections. 2001-03-06 15:00:08 +00:00
Andi Gutmans
eb6ba01d1c - Fix copyright notices with 2001 2001-02-26 06:11:02 +00:00
Rasmus Lerdorf
0d0a8f55d6 Kill warning 2001-01-22 01:13:49 +00:00
Zeev Suraski
3793dc18f2 Sigh. Even less sleep than I thought :) Really fix it this time. 2001-01-22 01:10:21 +00:00
Zeev Suraski
9a02c9993d Too much work, not enough sleep... Fix hash lookup 2001-01-22 01:08:28 +00:00
Zeev Suraski
6255a24f1c Don't overwrite PATH_TRANSLATED if it exists 2001-01-22 00:06:52 +00:00
Daniel Beulshausen
0d258cc523 make threaded apache module build again 2001-01-05 17:00:07 +00:00
Zeev Suraski
43a7643453 Fix last couple of problematic execution paths that could corrupt the INI values 2001-01-03 22:45:11 +00:00
Zeev Suraski
60776dbeeb Fix Apache module and remove excess elements from the SAPI structure 2001-01-03 11:56:00 +00:00
foobar
c5da386dbd Fix compile. 2001-01-03 11:39:09 +00:00
Zeev Suraski
bd0ac7fe14 Many patches. I hope I remember them all: 
- Make sapi_module available to external modules (PHPAPI)
- Make the php.ini path reported in phpinfo() always point to
  real full path of the php.ini file
- Optimized the ISAPI module not to read unnecessary server
  variables and read necessary variables at most once.
 2001-01-02 22:49:31 +00:00
Zeev Suraski
0048312fa6 Fix a few possible bugs: 
- engine=off in one or more vhosts could propogate to other vhosts
- Under some error situations, the default values for INI directives
  could be erroneously replaced for a single request
 2000-12-30 00:38:47 +00:00
Daniel Beulshausen
3b20a425c9 added missing SLS_FETCH() 2000-12-14 22:16:21 +00:00
Sascha Schumann
276cb7cdb1 Add apache_child_terminate() and INI setting apache.child_terminate 
which defaults to 0.

Submitted by: Sam Liddicott <sam.liddicott@ananova.com>
 2000-12-13 13:19:56 +00:00
Sascha Schumann
107aa9f71a Align ZTS handling of globals with common usage 2000-12-10 23:22:20 +00:00
Daniel Beulshausen
d41137fedf fix win32 apache module 
# this is ugly, has someone a better way?
 2000-12-10 22:40:07 +00:00
Daniel Beulshausen
1f31360f01 fix windows build 2000-12-10 22:06:07 +00:00
Sascha Schumann
0ddb725f91 Axe rest of DAV leftovers and use STD_PHP_INI_ENTRY in the INI section 2000-12-07 13:07:18 +00:00
Sascha Schumann
dedec6614e Automatically carry over macro definitions from Apache. 
We don't take everything, because apxs' CFLAGS also includes
optimization, debugging, et cetera flags.

PR: #7211
 2000-12-04 16:05:00 +00:00
Hartmut Holzgraefe
929197cf83 merged ext/apache/CREDITS and sapi/apache/CREDITS 2000-11-22 23:04:33 +00:00
Hartmut Holzgraefe
1f6878e912 2nd step towards auto-credits 2000-11-20 10:33:33 +00:00
Zeev Suraski
030b707296 Update SAPI modules to interface with the new TSRM. 
Enable thread-safety memory debugging in ISAPI when in debug mode
 2000-11-18 02:44:04 +00:00
Zeev Suraski
0f7f5c2c0e - Import Jade Nicoletti's transparent gzip encoding support as an output 
handler.  Works quite nicely!
- Fix buglets in output buffering
- Add output_handler INI directive
 2000-11-13 18:54:37 +00:00
Sascha Schumann
04f180b08a More verbose error message for non-working apxs case 2000-11-13 12:43:44 +00:00
Zeev Suraski
a023f9280a - Fix Windows build 
- Changed the Apache .dsp to expect the Apache source code files under php_build
 2000-11-02 14:53:10 +00:00
Zeev Suraski
8c4852c2cb Fix a nasty bug in the shutdown sequence of PHP under Apache. 2000-11-02 12:05:54 +00:00
Andi Gutmans
0330643ea2 - Revert patch which seems to have caused the STOP mechanism not to work. 
- I'm not quite sure why this should have caused harm even if not completey
- the right way of doing it.
 2000-11-01 11:23:52 +00:00
Zeev Suraski
0ee12a6488 Fix Apache build 2000-10-31 18:28:04 +00:00
Sascha Schumann
27a8480028 Add/unify aborted connection handling 2000-10-29 16:01:02 +00:00
Zeev Suraski
1fd09132c2 Initial steps to move the INI mechanism to the Zend engine 2000-10-29 11:38:26 +00:00
Rasmus Lerdorf
c3026223f7 This appears to be the correct fix to me. 
@ Fix memory leak in x-httpd-source mode (Jason Greene)
 2000-10-14 05:06:16 +00:00
Daniel Beulshausen
c6e0cef254 trivial output change 
# someone urged me too
 2000-10-13 19:08:05 +00:00
Zeev Suraski
ce51b94461 Fix php_value issue 2000-10-13 17:07:09 +00:00
Zeev Suraski
1abd99a443 Fixed a problem that allowed users to override admin_value's and admin_flag's 2000-10-11 16:24:35 +00:00
Andi Gutmans
2622eba31d - Cleanup some output functions 2000-09-30 16:13:48 +00:00
Sascha Schumann
3be464e4ec UnixWare defines shutdown to _shutdown, which causes problems later 
on when using a structure member named shutdown. Since this source
file does not use the system call shutdown, it is safe to #undef it.

PR: #6008, #6362
 2000-09-29 19:08:17 +00:00
Sascha Schumann
cd151feb19 #include "SAPI.h" once 2000-09-26 10:58:56 +00:00
foobar
9559b88894 Fixed bug #6356. 2000-09-11 13:01:07 +00:00
Jon Parise
9a4c654606 Fix build after last commit. 2000-09-08 15:39:42 +00:00
Zeev Suraski
91c808ecc4 Restore the headers_only test to the centralized SAPI startup. If necessary, it can 
be overriden in the activate() callback.
 2000-09-08 14:43:57 +00:00
Andi Gutmans
9b1aed8323 - Add another ..\ to the TSRM search path 2000-09-08 08:17:17 +00:00
Andi Gutmans
ed8c8539df - Add TSRM to the apache workspace include path 2000-09-08 08:15:25 +00:00
Sascha Schumann
89a2e1dbdb Add TSRM include dirs 2000-09-06 15:41:40 +00:00
Andi Gutmans
570e7e9a13 - Defining TSRM_WIN32 in each and every dsp sucked. Revert this change 2000-09-02 16:28:25 +00:00
Andi Gutmans
5bc9f72e85 - More Windows build fixes 2000-09-02 16:02:53 +00:00
Rasmus Lerdorf
8a36eb220e Missed a couple of center attributes 2000-08-28 09:01:54 +00:00
Daniel Beulshausen
c8eb56cc59 changed the output directorys from the windowsbuilds 2000-08-23 15:43:36 +00:00
Daniel Beulshausen
7632bca956 updated project to work with readdir.h rev.1.5 from apache cvs 2000-08-21 21:21:18 +00:00
Sascha Schumann
1d68a02df3 The status quo in PHP is that the current directory is initialized 
to the directory where the executing script is located.

Since this needs to be implemented for all SAPI modules anyway, this
change moves the functionality to php_execute_script() and gets rid
of the per-module code.
 2000-08-20 14:29:00 +00:00
Sascha Schumann
320105bcd8 Use size_t as parameter type in the getenv member of struct sapi_module 2000-08-20 14:20:21 +00:00
Stanislav Malyshev
6f8f6c521c Fix opened_path init 
# forgot to commit
 2000-08-13 18:08:01 +00:00
Rasmus Lerdorf
9021105c89 Fix typo 2000-08-04 16:48:42 +00:00
Rasmus Lerdorf
76a2d2538c Heads up! I have moved the headers_only and response_code checks out of 
SAPI and down into the individual SAPI modules.  I have made the
appropriate changes in all the SAPI modules, but please verify these.
The reason for this change is that Apache sometimes will feed PHP
a request_method of GET but have r->header_only set to true.  This happens
in an ErrorDocument redirect.  In this same scenario we want to preserve
the status code as well instead of just overwriting it with a 200 and
losing this information.  For now the other sapi modules act exactly as
before since they probably do not make this distinction, and they may
not even have a valid response code this early in the request.
@ Fix HEAD request bug on an Apache ErrorDocument redirect and preserve
@ the status code across the redirect as well.  (Rasmus)
 2000-08-02 22:48:45 +00:00
Rasmus Lerdorf
89107a221b Missed a symbol 2000-07-31 15:07:58 +00:00
Zeev Suraski
52ff887db5 Made ob_start() and friends reentrant. It's now possible to implement this 
long-requested functionality, now that output buffering is re-entrant:

function eval_ret($code)
{
	ob_start();
	eval($code);
	$retval = ob_get_contents();
	ob_end_clean();
	return $retval;
}
 2000-07-29 14:46:09 +00:00
Rasmus Lerdorf
b480b8dace Fix symbol clash which caused a DSO problem on OpenBSD 
@ Fix symbol clash which caused a DSO problem on OpenBSD (Rob Black and
@ anil@recoil.org)
 2000-07-26 20:39:59 +00:00
Sascha Schumann
06382f01fd Fix prototype of apache_child_exit_handler and remove popen-related 
preprocessor directives/macros.
 2000-07-10 09:20:35 +00:00
Thies C. Arntzen
1cee6c5b78 @- Fixed closing 2000-07-10 07:57:01 +00:00
Andreas Karajannis
59604815e1 Fixed module / global shutdown for apache. 
GSHUTDOWN functions are now executed and MSHUTDOWN functions are executed on child process exit
 2000-07-09 12:51:01 +00:00
Stanislav Malyshev
905fb8ef82 Fix #5432: should register all variables. Thanks jeroen@darius.demon.nl. 2000-07-06 17:40:18 +00:00
Rasmus Lerdorf
f2348a4826 When using HTTP auth from PHP, fill in the %u custom log field so the 
authenticated used id will get logged in the Apache access_log
@- When using HTTP auth from PHP, fill in the %u custom log field so the
@  authenticated used id will get logged in the Apache access_log (Rasmus)
 2000-07-05 18:02:42 +00:00
Sascha Schumann
16017f6d78 Change header protection macros to conform to standard. 
Draft 3 of IEEE 1003.1 200x, "2.2 The Compilation Environment"

  All identifiers that begin with an underscore and either an uppercase
  letter or another underscore are always reserved for any use by the
  implementation.
 2000-07-02 23:46:51 +00:00
Shane Caraveo
5fcf863579 fix apache dsp file 2000-07-02 17:20:03 +00:00
Rasmus Lerdorf
aa83dde27b Some user-agents send 'basic' instead of 'Basic' in their Authorization 
header.  ApacheBench is an example.  PHP's HTTP Auth would not work with
these.
Some user-agents send 'basic' instead of 'Basic' in their Authorization
header.  ApacheBench is an example.  PHP's HTTP Auth would not work with
these. (Rasmus)
 2000-06-30 17:39:21 +00:00
Zeev Suraski
37fb71b9ba Set version number on DLLs 2000-06-30 12:16:58 +00:00
Zeev Suraski
01a8f4606e I'm not sure whether this is necessary or not. Is it guarenteed that get_module_conf() 
will always return a value?  Even if there were no relevant directives at all?
 2000-06-28 18:27:13 +00:00
Andrei Zmievski
4010b422dd Separate plain name returned by php_sapi_module() and pretty name 
used for output.
 2000-06-26 18:05:55 +00:00
Sascha Schumann
ee5e330bcf alloc.h has been removed from the Apache 1.3 CVS tree 2000-06-24 11:39:37 +00:00
Hartmut Holzgraefe
5d6516be86 look for apxs in /usr/sbin (that's where SUSE puts it) 
if no path is given and apxs is not found in $PATH
 2000-06-17 06:22:40 +00:00
Sascha Schumann
8f8889d02d More main work 2000-06-16 11:07:13 +00:00
Andi Gutmans
2987d5216e - More #if WIN32|WINNT -> #ifdef PHP_WIN32 conversions 2000-06-15 23:45:05 +00:00
Sascha Schumann
111d36a3c8 Due to creating the Makefiles later, generating libphp4.module failed, 
because sapi/apache had not been created. This applies to VPATH builds
only.
 2000-06-13 18:02:28 +00:00
Zeev Suraski
02d2a5db3a Fix Windows .dsp's 2000-06-11 19:23:21 +00:00
Sascha Schumann
b98d2a8261 The ! command is not portable. 2000-06-09 17:19:26 +00:00
Sascha Schumann
e49ad341bd Wipe out acconfig.h.in and rewrite some checks to use PHP_ARG_ENABLE. 2000-06-08 06:14:58 +00:00
Sascha Schumann
102c6ce4b8 Move main.h to php_main.h. 2000-06-05 23:24:42 +00:00
Rasmus Lerdorf
78d77c1476 Fix virtual() when used with output buffering 
@ Fix virtual() when used with output buffering (Marc Pohl)
 2000-06-05 21:19:21 +00:00
Zeev Suraski
5673378ea6 - Allow all functions that receive user-defined function callbacks to accept 
an array that contains an object and a method name, in place of a function
  name, e.g. usort($array, array($obj, "ObjSort"))
(I checked the code in array.c and basic_functions.c, other code which uses
call_user_function() may still force the function_name argument to be of type
IS_STRING, which prevents this feature from working - and is no longer necessary)
 2000-06-03 04:16:46 +00:00
Rasmus Lerdorf
81c4fd5efc @ Changed the Apache handler's return status to 'Declined' when a requested 
@ PHP file could not be found.  Returning 'Not Found' caused problems
@ in the ErrorDocument handler stage in that $REDIRECT_REDIRECT_ERROR_NOTES
@ was not getting set at all.  Moving to 'Declined' shoudl fix this and I
@ can't see any other side effects.  (Rasmus)
Changed the Apache handler's return status to 'Declined' when a requested
PHP file could not be found.  Returning 'Not Found' caused problems
in the ErrorDocument handler stage in that $REDIRECT_REDIRECT_ERROR_NOTES
was not getting set at all.  Moving to 'Declined' shoudl fix this and I
can't see any other side effects.
 2000-05-26 18:43:09 +00:00
Zeev Suraski
e043439ff6 Update the license with the new clause 6 2000-05-18 15:34:45 +00:00
Zeev Suraski
6d77362190 Fix crash when server_context is not longer valid (e.g., when 
coming from php_apache_request_shutdown)
 2000-05-17 08:11:20 +00:00
Sascha Schumann
f1941064de Fix wording (not "to apxs", but "of apxs"). 2000-05-15 16:43:44 +00:00
Sascha Schumann
13e9da59ff Complain loudly and stop configuration, if we cannot run apxs. 2000-05-15 16:37:32 +00:00
Zeev Suraski
7fc980e1fa Please maintain consistency in these names... :) 2000-05-14 16:09:32 +00:00