Commit Graph

427 Commits

Author SHA1 Message Date
Andi Gutmans
69e2d48738 - Change spaces to tab 2000-08-28 19:31:56 +00:00
Rasmus Lerdorf
8a36eb220e Missed a couple of center attributes 2000-08-28 09:01:54 +00:00
Sascha Schumann
0b719aa462 Compute absolute path to script 2000-08-27 20:53:10 +00:00
Stig Bakken
315f4f5658 @PHP 3 regression testing framework re-born (Stig)
Took the old PHP 3 regression testing framework and rewrote it in PHP.
Should work on both Windows and UNIX, however I have not tested it on
Windows.  See tests/README for how to write tests.  Added the PHP 3
tests and converted most of them.
2000-08-27 19:46:06 +00:00
Sascha Schumann
c66bc46bb1 Remove obsolete note about Makefile.am 2000-08-27 10:05:23 +00:00
Sascha Schumann
c6cd319cd4 Use request_uri as PHP_SELF. decodedurl also includes the query string. 2000-08-25 10:00:48 +00:00
Sascha Schumann
5905971122 Use SAPI' register_server_variables hook.
Defines PHP_SELF now.
2000-08-25 09:59:38 +00:00
Sascha Schumann
ad04898e05 php_register_variables(.. ELS_CC ..) 2000-08-25 09:15:00 +00:00
Sascha Schumann
8a1db559b6 Make proper use of SAPI's register_environment functionality. 2000-08-25 08:46:32 +00:00
Daniel Beulshausen
c8eb56cc59 changed the output directorys from the windowsbuilds 2000-08-23 15:43:36 +00:00
Daniel Beulshausen
000773e7b9 little fixes 2000-08-22 15:03:38 +00:00
Sascha Schumann
bac08af4cb Disable php_value and add note about reliability 2000-08-22 07:33:27 +00:00
Sascha Schumann
2011db174b AOLserver CVS uses PREFIX. 2000-08-22 06:11:01 +00:00
Sascha Schumann
479a96ed89 Set file_handle.opened_path to NULL 2000-08-22 05:43:31 +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
Daniel Beulshausen
0b686eaa2a added the vs6 projectfile for the aolserver 2000-08-21 20:55:10 +00:00
Sascha Schumann
e4b2f8351e thttpd/PHP verified to run IMP 2.2.0 without any hitches. 2000-08-21 20:23:02 +00:00
Sam Ruby
b43df683ee Keep servlet working... 2000-08-21 17:01:51 +00:00
Sascha Schumann
251b83076e Move thttpd_php_init() call to httpd_initialize().
Otherwise, some init stuff was done twice (like resetting the
known_post_content_types hash table which caused post requests
to fail).
2000-08-21 03:04:35 +00:00
Zeev Suraski
30ccec36b9 Fix build 2000-08-20 22:18:19 +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
Sascha Schumann
67daa655f6 Execute PHP scripts everywhere (not only in the top-level directory) 2000-08-20 09:37:15 +00:00
Ben Mansell
ea98567404 REQUEST_URI is a handy server variable, lets pass it onto ISAPI/PHP 2000-08-18 14:18:57 +00:00
Sam Ruby
3aad950735 Reorder call to ELS_FETCH to be after declarations 2000-08-17 19:19:54 +00:00
Ben Mansell
8751bcb8eb (send_headers) Removed code freeing http_status_line, this is performed
in sapi_send_headers()
# Looks like a similar problem in sapi/pi3web/pi3web_sapi.c as well.
# I can't test this though, so I'm being paranoid and not changing that code.
# Could someone please check this?
2000-08-17 13:40:40 +00:00
Sam Ruby
d93732179b Better error reporting when dll/shared library is not able to be loaded.
Submitted by: Bård Farstad <bf@ez.no>
2000-08-17 10:14:50 +00:00
Stanislav Malyshev
6f8f6c521c Fix opened_path init
# forgot to commit
2000-08-13 18:08:01 +00:00
Stanislav Malyshev
5090b1e8d5 Fix zend_fiel_handle handling. Should fix URL include
and various opened_path inconsistencies.
2000-08-13 18:00:50 +00:00
Sam Ruby
5c8fca1757 Correct bug in headers only logic. 2000-08-10 06:09:05 +00:00
Zeev Suraski
4d692049b2 Fix a couple of bugs in the ISAPI module:
- I think NTLM should work now
- Fix the DOCUMENT_ROOT code
2000-08-09 16:45:40 +00:00
Sascha Schumann
5c62b32823 Remove some crud from diff output (Only in..). 2000-08-07 13:56:52 +00:00
Sascha Schumann
4b8823d427 Fix building thttpd SAPI module.
This works now with thttpd 2.19.

Thanks to Andrzej Borsuk <andrzej.borsuk@alfaelektro.com.pl> for
pointing me into the right direction.
2000-08-07 13:54:35 +00:00
Zeev Suraski
83341c39da Add DOCUMENT_ROOT 2000-08-07 11:51:21 +00:00
Stanislav Malyshev
db0872123b Fix crash on broken setups (#5979) 2000-08-05 11:28:32 +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
Sam Ruby
4ca1c611b3 Refactor in support of subclassing 2000-07-30 04:50:31 +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
Hartmut Holzgraefe
1a7f851985 added '-l' option to command line / CGI version for 'syntax check only'
plus a little cleanup and rearranging in command line option parsing

@ CGI aka. command line version has now an option '-l' for syntax check
@   without execution (Hartmut)
2000-07-28 15:21:20 +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
David Croft
0836e10a15 various version 2.0 and 2.01 licenses -> 2.02 2000-07-24 05:41:02 +00:00
Sam Ruby
54790b5e63 Correct the value of request_uri 2000-07-24 05:29:20 +00:00
Stanislav Malyshev
4c6ffdb1c2 make -c in stand-alone mode work again.
Setting ini_path after php_module_startup doesn't do much good -
since php_module_startup reads .ini.
# This fix is very ugly. Everyone is welcome to make better fix
# that won't report errors twice and won't scan argument 3 times
2000-07-13 09:17:39 +00:00
Sascha Schumann
e8101d4f7b Unify use of my email address 2000-07-10 10:09:15 +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
Sam Ruby
5c13954eed Fix for JDK1.2.2/Tomcat3.2
(can't find beanInfo for interfaces which extend other interfaces)
2000-07-09 04:09:47 +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
e805a607cf Fix typo. A shutdown function is of course called, when the server
exits.
2000-07-05 11:27:24 +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
Shane Caraveo
712cd89434 fix nsapi dsp file 2000-07-02 17:19:49 +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
Sam Ruby
f72de266e2 remove unnecessary dependency 2000-06-30 14:33:46 +00:00
Zeev Suraski
37fb71b9ba Set version number on DLLs 2000-06-30 12:16:58 +00:00
Andi Gutmans
85422c3c60 - Extra newline crept in somehow 2000-06-29 13:34:58 +00:00
Andi Gutmans
1f828a6e88 - Fix problem with DICARD_PATH being defined in windows 2000-06-29 13:31:52 +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
Sam Ruby
e216b8918e defer loading of the native code 2000-06-27 10:37:40 +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
Andi Gutmans
fd11a7e13e - Pray this is an OK fix for the DISCARD_PATH junk 2000-06-26 17:57:03 +00:00
Stanislav Malyshev
378440f7cf Right name for the function persist_alloc 2000-06-26 16:26:20 +00:00
Andi Gutmans
91ed009ae2 - Try two in fixing the problem with memory leaks reporting path_translated 2000-06-26 16:17:58 +00:00
Zeev Suraski
effa42696e - Fix problem with filename being freed before possible memory leaks are
- reported by the memory manager
2000-06-26 15:55:59 +00:00
Stanislav Malyshev
5be54abf24 If we freed it, we might not touch it
# BTW, this is not a real fix - we still might use it
# when reporting memory leaks, but at least we won't reference
# unitialized memory
2000-06-26 12:26:40 +00:00
Zeev Suraski
cb5891d277 Apply the NSAPI patch 2000-06-24 16:31:10 +00:00
Sascha Schumann
0c03253635 Stop including dl/phpdl.h. 2000-06-24 15:36:04 +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
Holger Zimmermann
fce46168d1 Changed strtok_r to php_strtok_r 2000-06-18 19:01:54 +00:00
Sascha Schumann
80a05cd78c Cosmetic cleanups 2000-06-18 15:30:55 +00:00
Sascha Schumann
8975f1dceb Readd pi3web_sapi.c and reset flags. 2000-06-18 10:21:20 +00:00
Holger Zimmermann
da132274a4 Added Pi3Web support 2000-06-17 12:06:09 +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
Hartmut Holzgraefe
87a491d7b6 C++ // comments are evil ... 2000-06-16 18:24:02 +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
Andi Gutmans
17ce56825d - Beautify a bit 2000-06-15 22:46:17 +00:00
Andi Gutmans
fcefeee914 - Try and fix crash with CGI.
- Please check out the comment I wrote in init_request_info(). There was a
- lot of code there which was running for no apparent reason. Should it be
- removed or should it actually run?
2000-06-15 22:40:52 +00:00
Andi Gutmans
4c99114a25 - Unncessary SLS_FETCH(); 2000-06-15 21:34:00 +00:00
Sam Ruby
988302171a Find servlet includes in new "main" directory. Add (finally) java and
servlet to the list of projects
2000-06-14 11:25:54 +00:00
Sam Ruby
f775d18b2c Export the necessary functions to enable servlet support to be subclassed
This is in preparation for xml-cocoon support
2000-06-14 01:41:13 +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
Sascha Schumann
6caf633cf7 Proper casts 2000-06-13 09:17:06 +00:00
David Hedbor
cefc1f2336 Removed obsolete, commented line 2000-06-12 23:41:34 +00:00
Zeev Suraski
02d2a5db3a Fix Windows .dsp's 2000-06-11 19:23:21 +00:00
Andi Gutmans
77f4e1c8c7 - This seems to be a bug. Anyone know who wrote this code? Should it stay
- in?
2000-06-10 09:05:22 +00:00
Sascha Schumann
b98d2a8261 The ! command is not portable. 2000-06-09 17:19:26 +00:00
Anthony Whitehead
deff917851 Added more server variables to the HTTP_SERVER_VARS array, all the
variables listed in the structs in nsapi.c should work now. Untested on
Windows platform.
2000-06-08 11:56:36 +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
David Hedbor
a5418dc0ac Added another bug to be fixed 2000-06-06 16:18:09 +00:00
David Hedbor
dd6cccf50e PRE_INCLUDES hack reverted 2000-06-06 00:02:03 +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
David Hedbor
ad730a374b List with TODO items 2000-06-05 21:05:51 +00:00
David Hedbor
ebe02095df Fixed include directory problems. 2000-06-05 21:05:40 +00:00
David Hedbor
7fdfcc28ec Changed include statement for main.h to avoid inclusion of Pike's main.h. 2000-06-05 19:51:22 +00:00