Sterling Hughes
2d84ecbba8
Remove redundancy
...
# And further fix problem ;)
2001-05-16 18:15:49 +00:00
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
Sascha Schumann
718b588b14
Fix indentation of ./configure --help messages.
2001-05-12 09:13:42 +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
4afa93f716
@- Fixed a possible crash in the PHP CGI when no input file is
...
@ specified (Zeev)
Fixed bug 7822
2001-05-10 14:13:18 +00:00
Zeev Suraski
6cd3b987b8
$argc was off by one in -f (fix bug #9289 )
2001-05-08 00:51:11 +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
David Hedbor
935d6287fd
Patch from Jan Legenhausen to add vars to the HTTP_SERVER_VARS array.
2001-05-07 06:43:37 +00:00
Ben Mansell
13e4699ae3
Removed a duplicate php_import_environment_variables() call
...
from fastcgi sapi
2001-05-04 09:49:14 +00:00
Sascha Schumann
e337f07ecd
Replace slow strlcpy with a quick memcpy.
2001-05-03 09:04:15 +00:00
Andi Gutmans
8975186810
- Another strncpy() -> strlcpy() change
2001-05-02 22:53:41 +00:00
Ben Mansell
98af7a8d7d
Patch from Stephen Landamore: speed up the environment merging by
...
using memcpy instead of putenv.
2001-05-02 17:19:58 +00:00
Andi Gutmans
a166b6146b
- Remove unused variable
2001-05-01 07:16:57 +00:00
Sterling Hughes
ba49860cc8
fix for bug 6491, http://www.php.net/bugs.php?id=6491 , removes a bit of
...
(what I think is) broken logic.
# This is as discussed on the mailing list previously. This change
# does fix the problem, however, the extra code was in there for a
# reason (I'm guessing :), i'm ready to revert this patch in a jiffy
# if someone has a good reason why that (just removed) extra logic
# should be in there.
2001-05-01 03:48:27 +00:00
Andi Gutmans
6196e0bc4d
- Fix for Bug id #10071
...
PR:
Submitted by:
Reviewed by:
Obtained from:
2001-04-30 22:47:51 +00:00
Andi Gutmans
4c823e8a89
- Change macros from V_ to VCWD_ because of AIX name clash
2001-04-30 12:45:02 +00:00
Daniel Beulshausen
59f3775f7c
add/fix pi3web dsp
2001-04-28 18:46:56 +00:00
Sascha Schumann
6602b48071
Fix optimization -- we did not send out custom Response Status Lines.
2001-04-25 06:42:24 +00:00
Sascha Schumann
ab1df8dfb9
Accomodate Apache HTTPD 2.0 API change
2001-04-24 12:57:34 +00:00
David Hedbor
d522a6a25e
Disable use of th_farm since it doesn't seem to work. Uses a Pike layer
...
thread farm now instead.
2001-04-24 01:08:35 +00:00
Sascha Schumann
ff423ef9d9
remove Only.* lines from patch
2001-04-22 14:33:57 +00:00
Sascha Schumann
0fc2ca64bf
bytes in the conn structure was renamed to bytes_sent.
2001-04-22 14:22:40 +00:00
Sascha Schumann
38e55b3249
Update patch to thttpd-2.21
2001-04-22 14:00:53 +00:00
Stig Bakken
0b2641efa6
@Added -C command-line option to avoid chdir to the script's directory (Stig)
2001-04-16 23:20:47 +00:00
Sascha Schumann
466c226415
Revert mega patch.
...
This patch has at least the following deficiences:
- the CGI is built using objects from another SAPI module.
This usually results in unsatisfied symbol references.
- the CGI makefile is not created properly
- building CGI cannot be disabled
2001-04-09 15:47:19 +00:00
Stig Bakken
a4877d7afd
* CGI version is always installed!
...
* replaced --disable-pear with --with-pear=DIR (or --without-pear),
is backwards compatible
* use --datadir, --libdir and --sysconfdir configure options to determine
where PEAR files, shared extensions and php.ini goes
* simplified the extension version directory name
2001-04-08 22:30:17 +00:00
Holger Zimmermann
23f3187b6f
Contribute the MSVC project file. Someone could add this to the php4ts workspace.
2001-04-08 11:04:27 +00:00
Holger Zimmermann
8c0f71e7b3
Reorganized the #define's in the header.
2001-04-08 10:49:07 +00:00
Holger Zimmermann
9b7aa43dd4
Updated copyright agreement regarding move of Pi3Web to sourceforge.
2001-04-08 08:25:20 +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
Ben Mansell
afbcd5c4eb
Changed header handling; before, we were somehow losing
...
Content-Type: text/html
2001-03-27 15:16:34 +00:00
Ben Mansell
4549e389bb
Fix a bug with POST requests. If the Content-Type header wasn't present,
...
we were setting SG(request_info).content_type to NULL, instead of
an empty string. This was stopping PHP from processing the data.
2001-03-22 18:54:51 +00:00
Ben Mansell
87bc51fc5c
Fix a bug with POST requests. If the Content-Type header wasn't present,
...
we were setting SG(request_info).content_type to NULL, instead of
an empty string. This was stopping PHP from processing the data.
2001-03-22 18:48:51 +00:00
Ben Mansell
2c8c9d68d7
Altered README.Zeus to give instructions on building FastCGI.
...
Changed --with-zeus configure option into --with-isapi, since its more
descriptive (and since there are now different ways to configure PHP+Zeus)
2001-03-19 11:23:57 +00:00
Ben Mansell
08df6f9b67
@ New FastCGI server module
...
New FastCGI server module. Based on the thttpd server module with
large chunks of code ripped from the cgi module. Also modifies
Makefile.in and configure.in in order to make it build properly.
# This initial checkin has been tested with the Zeus web server,
# but should work with any server that has a correct FastCGI
# implementation.
2001-03-19 11:03:29 +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
Sascha Schumann
5708ddf171
Replace memcpy and sprintf with smart_strs.
2001-03-13 17:14:47 +00:00
foobar
f4917d49c3
Fixed the help for other options too.
2001-03-07 13:24:12 +00:00
Ben Mansell
515c20da47
Added support for Zeus SSL client certificate information.
...
Added SERVER_SIGNATURE to the environment.
Submitted by: daniel@zeus.com
2001-03-07 10:28:00 +00:00
Zeev Suraski
800950c5a7
Avoid using ret uninitialized
2001-03-06 15:10:53 +00:00
Ben Mansell
a40f208ab8
Thread hashtable was being initialized with a size of 1! Changed to 128 as
...
a more sensible number.
# Also could change the 'expected resources' parameter from 1, but I
# haven't tested that bit yet
----------------------------------------------------------------------
2001-03-06 15:09:15 +00:00
Zeev Suraski
559c254f8f
Avoid writing to error_log in case of aborted connections.
2001-03-06 15:00:08 +00:00
foobar
356fc41a0a
Fix help text for -f
2001-03-05 15:08:36 +00:00
foobar
81a2669216
Can't output any error messages if there isn't any function initialized
...
to do it..
# Bug report: #7650
2001-03-05 01:26:36 +00:00
Zeev Suraski
ce39c56c8b
whitespace fix
2001-03-04 01:08:46 +00:00
Sascha Schumann
de6c69f716
Combine all HTTP headers into a single writev
2001-03-02 17:01:52 +00:00
Andi Gutmans
abb18a7918
- Commit NSAPI patches.
2001-03-02 15:25:51 +00:00
Sascha Schumann
2da359bb84
httpd-2.0 cvs seems to be busted. I'm getting very strange backtraces
...
and the header filter still seems to be broken. Will try later.
2001-02-28 14:19:15 +00:00
Sascha Schumann
a824c87e6d
Now it actually loads, but it segfaults upon a request.
2001-02-28 14:11:34 +00:00
Sascha Schumann
6ed0cbb140
Make the module compile again with the latest httpd-2.0 cvs.
2001-02-28 14:03:58 +00:00
Ben Mansell
5e5f5886ff
Added PHP_AUTH_USER, PHP_AUTH_PW and PHP_AUTH_TYPE environment variables
...
for Zeus/ISAPI, so basic authenication works.
Submitted by: daniel@zeus.com
2001-02-27 13:29:21 +00:00
Andi Gutmans
a0d3c5a88e
- Finally rename modules.h to zend_modules.h for consistency (first try
...
was 2000-03-11).
- Remove the first_arg_force_ref[]; and friends extern from php.h as they
are included via zend_API.h
2001-02-26 18:14:50 +00:00
Andi Gutmans
eb6ba01d1c
- Fix copyright notices with 2001
2001-02-26 06:11:02 +00:00
Sascha Schumann
adb3e3992c
php_register_command_line_global_vars only needs file scope.
2001-02-24 21:07:07 +00:00
Sascha Schumann
280e10aac7
Neither the CGI nor the Servlet SAPI module call syslog, so remove
...
references to the syslog include files.
2001-02-24 21:05:02 +00:00
Sascha Schumann
d516726329
Change the default to assumption that people don't use AOLserver 3.0 anymore.
2001-02-24 13:14:27 +00:00
Sascha Schumann
c2fb53bed7
Finish fopen-wrappers rename.
2001-02-23 22:07:16 +00:00
Sascha Schumann
4a32816f9e
If we cannot send the header, we don't need to continue with the page.
2001-02-21 20:25:53 +00:00
Sascha Schumann
328ca1b178
There is no need to declare ap_php_(opterr|optopt) with external linkage
...
as they are not used outside of getopt.c.
PR: #9364
2001-02-21 07:41:01 +00:00
Sascha Schumann
2403578e35
Include <sys/uio.h>. Apparently, the header cleanup in glibc 2.2.2
...
caused that file to be included by accident.
2001-02-19 10:28:08 +00:00
Sascha Schumann
8c92cdd897
Save 50% of the syscalls when writing the HTTP header.
2001-02-18 19:03:36 +00:00
Ben Mansell
f49d4de599
Fixed non-threadsafe code: 'isapi_special_server_variables' was a static
...
buffer, and not allocated per-connection. Bad bad bad!
2001-02-16 16:01:34 +00:00
David Hedbor
140279fc7b
Fixed PHP authentication and some other minor things.
2001-02-09 05:32:42 +00:00
Sascha Schumann
9db16758b3
Make fprintf's optional
2001-02-08 16:26:18 +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
Ben Mansell
12537e9787
@ Support Zeus 3.3.8
...
Added changes to environment variable manipulations, to support Zeus 3.3.8
and increase compatibility between Zeus/IIS/Apache. Now, URLs like
http://foo.org/file.php/a/b/c/d work correctly.
# While testing, it looks like IIS+ISAPI is mishandling URLs like the above.
# The PATH_TRANSLATED given by ISAPI includes the /a/b/c/d bit of the URL,
# so using this var to find the script file to open on disk will not work.
# We now use SCRIPT_FILENAME if it is present (in Zeus 3.3.8)
# IIS doesn't seem to set this variable, it might be necessary to mangle
# SCRIPT_NAME and APPL_PHYSICAL_PATH together?
2001-01-16 10:44:52 +00:00
Zeev Suraski
a910f8cc80
Fix output dir
2001-01-15 15:16:30 +00:00
Zeev Suraski
9877acdb32
- Implement CompareStringWithFile()
...
- Remove a stupid NULL assignment that slipped in the last commit
2001-01-15 15:13:50 +00:00
Zeev Suraski
47ea52ca58
- Implement quick file comparing routine
...
- Fix crash - wait on the threads themselves, not on Event objects.
It takes time between the time a thread signals the event, and the
time it actually terminates (shutdown code) - so FreeLibrary() and
the main() termination could occur before all of the threads
terminated...
2001-01-15 14:55:30 +00:00
Sascha Schumann
f6eae19147
Try harder to push data through the wire.
...
I just learned that the AOLserver module will be used for a 100k users
webmail service. Wheee!
2001-01-15 14:48:14 +00:00
Shane Caraveo
42b1b44ad4
test now produce valid OK or FAIL.
2001-01-15 01:52:47 +00:00
Shane Caraveo
ebe94513cc
dont do results if not using test files
2001-01-15 01:17:44 +00:00
Shane Caraveo
1d40310fa4
clean up temp files
2001-01-15 01:13:51 +00:00
Shane Caraveo
c88be3f8b3
check files open
2001-01-15 00:57:16 +00:00
Shane Caraveo
833ba12664
fix file reading, add results
2001-01-15 00:56:23 +00:00
Shane Caraveo
dd01542bad
Multithreaded stress test program for isapi module now supports phpt files
...
still stuff to do before it's realy done, but does run the tests, just need
to get it to compare results right now.
2001-01-15 00:29:49 +00:00
Sascha Schumann
ae92ebb92b
Especially on FreeBSD it seems to be common that send(2) does not
...
do a decent job. We handle that better now.
2001-01-10 13:51:58 +00:00
Sascha Schumann
de847f60ba
Propagate the response code/HTTP status code back to thttpd for logging.
2001-01-09 09:01:33 +00:00
Sascha Schumann
7dd166e8c0
Account the number of sent bytes properly
2001-01-09 08:45:05 +00:00
Sascha Schumann
426d4104ea
Make Apache 2.0 filter build again
2001-01-08 23:18:47 +00:00
Shane Caraveo
b2cb9ac8fe
ignore blank lines
2001-01-08 01:14:49 +00:00
Shane Caraveo
0a1d3aa108
add notes on this program
2001-01-08 00:10:06 +00:00
Shane Caraveo
a1c3f92ac7
stresstest is based on cgiwrap. it can be used to debug php4isapi.dll without
...
the use of an actual web server.
2001-01-07 23:52:18 +00:00
Shane Caraveo
f1afd6f487
define flag to turn off exception handling
2001-01-07 23:45:24 +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
Holger Zimmermann
7af7199a17
Minor update regarding new phpinfo table format. Moved pi3web_sapi.h to the sapi module.
...
PR:
Submitted by:
Reviewed by:
Obtained from: Pi3Web
2000-12-28 08:31:42 +00:00
Zeev Suraski
a697d076bc
Add Release_TSDbg support. This mode compiles PHP with the release C runtime,
...
but with optimizations disabled and with debug info. Some crashes can only
be debugged using this mode.
2000-12-26 22:15:32 +00:00
Zeev Suraski
aa6d2ac5d0
Heads up people!
...
Updated the get_current_key() API - the relevant authors, please take
a look at the updated code and make sure it's ok...
2000-12-22 12:57:09 +00:00
Sascha Schumann
7f96af83b2
Stop automatically passing vars to AC_SUBST through PHP_SUBST.
...
There are some variables which are needed for Makefiles and files
created by AC_OUTPUT; we use PHP_SUBST_OLD for those now.
genif.sh was moved to an appropiate place.
2000-12-20 17:21:37 +00:00
Andi Gutmans
86a1cace27
- Make all places use MAXPATHLEN in the same way. It includes the
...
terminating NULL.
2000-12-16 20:52:43 +00:00
Sam Ruby
a472edb99b
AIX's XlC++ does not allow casts as an lvalue.
2000-12-16 00:15:56 +00:00
Ben Mansell
fbf699adb6
Fix Zeus' behaviour with URL, SCRIPT_NAME, SCRIPT_FILENAME, REQUEST_URI
...
environment variables
PR:
Submitted by:
Reviewed by:
Obtained from:
2000-12-15 16:18:55 +00:00
Daniel Beulshausen
3b20a425c9
added missing SLS_FETCH()
2000-12-14 22:16:21 +00:00
Ben Mansell
a017a6c025
(Zeus) Re-added some server variables that will be used.
...
Also added DOCUMENT_ROOT, was missing before for non-Win32
2000-12-13 17:11:01 +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
104311042c
Add TODO note
2000-12-11 08:05:53 +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
David Hedbor
9147a81a19
Fix for Pike 7.1 (error -> Pike_error). Caudium bug #12486 .
2000-12-07 19:01:13 +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
7e28784de3
Fix indentation of configure output
2000-12-06 17:34:58 +00:00
David Hedbor
694a5620e4
Removed a fatal condition to allow for harmless user error plus some other
...
small changes.
2000-12-04 23:12:40 +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
Sascha Schumann
c95a8f39b9
Merge with php_4_0_4
2000-12-03 08:37:43 +00:00
David Hedbor
1731fb0c67
Minor cosmetic changes.
2000-12-01 23:34:01 +00:00
David Hedbor
bb1d16c122
More config.m4 fixes.
2000-12-01 23:10:49 +00:00
David Hedbor
8d48566c6f
Updated config test to also work with debian pike 7 cvs etc.
2000-12-01 22:23:37 +00:00
Hartmut Holzgraefe
929197cf83
merged ext/apache/CREDITS and sapi/apache/CREDITS
2000-11-22 23:04:33 +00:00
Sascha Schumann
6c1af20310
Set the exit status from the return value of php_execute_script()
2000-11-22 04:24:04 +00:00
Hartmut Holzgraefe
1f6878e912
2nd step towards auto-credits
2000-11-20 10:33:33 +00:00
David Hedbor
49014ed560
Patch to find module dir
2000-11-19 09:10:16 +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
Sascha Schumann
4bb564ad2b
Clear idle_read_timer
2000-11-15 23:37:50 +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
39f8c9807e
Update patch and add persistent connection handling
2000-11-13 13:33:12 +00:00
Sascha Schumann
3fbfbf1f45
Add thttpd-dependent interface for maintaining persistent connections on
...
an iterative web-server. This will be used by the IRCG extension.
2000-11-13 13:23:56 +00:00
Sascha Schumann
04f180b08a
More verbose error message for non-working apxs case
2000-11-13 12:43:44 +00:00
Sascha Schumann
8658cace16
Add note about serialized requests and their impact
2000-11-13 12:39:15 +00:00
Sascha Schumann
6a149caaed
Fix aborted connection handling and stop modifying thttpd data
2000-11-12 21:10:09 +00:00
Sascha Schumann
86b8e890dc
strdup private AOLserver data before inserting it into SAPI's request_info.
2000-11-11 18:35:15 +00:00
Sascha Schumann
802d716c0d
Update README
...
Make Apache-related functions build
Add get_all_headers()
Fix segfault when SAPI outputs strings of length 0
Move request ctor/dtor into their own functions
2000-11-11 18:24:27 +00:00
Zeev Suraski
9e40204f00
@- In CGI mode, $HTTP_SERVER_VARS now includes all of the environment variables
...
@ as well (Zeev)
2000-11-07 18:25:29 +00:00
David Hedbor
6f0014982d
Noted that setting of multiple headers with the same name is fixed.
2000-11-06 22:12:11 +00:00
David Hedbor
61f2088846
(php_caudium_set_header): Allow for multiple headers with the same name.
2000-11-06 22:11:10 +00:00
Zeev Suraski
efd8117fd4
Fixed a bug in $argv and $argc not being properly defined in command-line mode
...
@- Fixed a bug that prevented $argv and $argc from being defined in the command
@ line version of PHP (Stas)
2000-11-06 09:55:53 +00:00
Stanislav Malyshev
24035faa29
I guess SG(request_info).argv0 and not !SG(request_info).argv0 was an intent, otherwise it doesn't make much sense.
2000-11-06 09:31:48 +00:00
Sascha Schumann
e7a632e950
Add apache_sub_req()
2000-11-06 01:46:28 +00:00
Rasmus Lerdorf
5a58b723ec
Remove apache2 sapi module in favour of Sascha's apach2filter
2000-11-05 17:41:03 +00:00
Rasmus Lerdorf
1f3273481e
We need a space after 'dnl' to comment stuff out. Why not just delete
...
this stuff now?
2000-11-05 17:31:17 +00:00
Rasmus Lerdorf
ed218bb6b4
dnldnl won't work
2000-11-05 17:29:04 +00:00
Sascha Schumann
a6a792ecdd
Outcomment everything. Since this is an exact duplicate of apache/config.m4,
...
it might cause conflicts.
2000-11-05 15:59:58 +00:00
foobar
3e8ac5d7f8
Fix build.
...
# next time: CHECK that things WORK before committing..
2000-11-03 16:30:55 +00:00
Daniel Beulshausen
5e48df787a
use argv[1] if it's given, thanks to Bob Denny <rdenny@dc3.com>
2000-11-03 09:55:54 +00:00
David Hedbor
1497e148f4
Use V_CHDIR_FILE instead of doing the job of that function myself and
...
added a define to disable the use of threads for debugging purposes.
@Support for the Caudium webserver (http://caudium.net/ ) added. It's based
@on the Roxen SAPI module. Many bugs have been identified and fixed. (David)
2000-11-03 00:29:05 +00:00
Sascha Schumann
51ec089429
Setting no_cache causes Expires: to be send, which is not what we want.
...
Also disable ETag. It does not serve any purpose for dynamic pages.
Finally, disable keep-alive connections again, since we don't know
the content-length for sure.
2000-11-03 00:11:42 +00:00
David Hedbor
2986b89e1d
Now correctly detects Pike 7.0 and use the alternative code. It also sends the
...
number of written bytes to the done callback function.
2000-11-02 20:05:24 +00:00
David Hedbor
a878709db3
Changed contact information.
2000-11-02 18:56:42 +00:00
David Hedbor
838264de75
Added notice about Caudium websites.
2000-11-02 18:54:21 +00:00
David Hedbor
8aa6f6d55c
Initial caudium support.
2000-11-02 18:53:47 +00:00
Sascha Schumann
a44361a769
Update. Someone should really write better docs. =)
2000-11-02 16:15:03 +00:00
Sascha Schumann
43ff395b65
Const'ify part of sapi_request_info.
...
query_string, post_data, path_translated, request_uri, auth_user,
auth_password and argv0 are modified, so they cannot become const.
2000-11-02 15:47:02 +00:00
Sascha Schumann
3ac8e25812
Namespace protect dir_cmds and kill some warnings
2000-11-02 15:19:54 +00:00
Sascha Schumann
1f53d0203c
Restrict php_admin_value to *.conf files.
2000-11-02 15:01:25 +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
Sascha Schumann
d9ba87c84c
Our context's lifetime differs from the lifetime of a filter's context,
...
so don't set the filter's context in the INIT_CTX macro.
2000-11-01 19:26:57 +00:00
Sascha Schumann
87e88d5a33
Use Input filters for handling POST data
2000-11-01 19:19:46 +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
Stanislav Malyshev
3bc3677439
Fix -d functionality
2000-10-31 16:16:57 +00:00
Sascha Schumann
4d0992bb22
Remove --with-aolserver-src directive.
...
AOLserver 3.1 and up install the include directory as per suggestion.
2000-10-30 11:44:18 +00:00
Sascha Schumann
d39c2cf0f1
POSTs work fine
2000-10-29 17:48:13 +00:00
Sascha Schumann
b07276c3e2
Add standard license
2000-10-29 17:43:23 +00:00
Sascha Schumann
af87dfe204
Unify handling of aborted connections
2000-10-29 16:14:27 +00:00
Sascha Schumann
bed7034f92
Unify aborted connection handling
2000-10-29 16:02:40 +00:00
Sascha Schumann
27a8480028
Add/unify aborted connection handling
2000-10-29 16:01:02 +00:00
Sascha Schumann
c38005a4f1
New directive AddRequestBodyFilters
...
Currently it requires this patch:
http://schumann.cx/request-body-filters
2000-10-29 15:13:23 +00:00
Sascha Schumann
f01e3fbe56
Handle user aborts
2000-10-29 15:10:49 +00:00
Sascha Schumann
86b2d4fefe
Add Request Body filters. This is a much nicer concept than
...
ap_get_req_body, since it is much more flexible and does not
need to buffer everything in memory (PHP still does..).
2000-10-29 14:52:15 +00:00
Zeev Suraski
1fd09132c2
Initial steps to move the INI mechanism to the Zend engine
2000-10-29 11:38:26 +00:00
Thies C. Arntzen
825457ae64
update my email.
2000-10-29 09:14:55 +00:00
Sascha Schumann
d943274af7
POST handler for my ubercool new Apache 2.0 function ap_get_req_body.
2000-10-27 23:02:20 +00:00
Sascha Schumann
ea7534a848
use puts instead of fprintf in log handler. no need for a format string.
2000-10-27 15:40:16 +00:00
Sascha Schumann
56ccd8701d
Some information about this handler
2000-10-27 15:03:53 +00:00
Sascha Schumann
b522397298
Looks like transient buckets are limited to 4096 bytes, so split up writes.
2000-10-27 13:30:41 +00:00
Sascha Schumann
93683d052b
Add log message sapi handler.
...
Reenable pipelining requests. Looks like the problems are caused by the
cache, not pipelining.
2000-10-27 13:19:23 +00:00
Sascha Schumann
50500e680b
Apache 2.0 does some funky internal caching which works for static
...
content, but fails miserably in our context.
2000-10-27 12:52:38 +00:00
Sascha Schumann
4f97ff0096
speling
2000-10-27 12:37:05 +00:00
Sascha Schumann
703a0c1159
Add some comments
2000-10-27 10:41:24 +00:00
Sascha Schumann
6ff371d9f7
Leave initializing of auth_(user|password) to php_handle_auth_data().
2000-10-27 10:31:10 +00:00
Sascha Schumann
b725c6eef3
The CGI RFC allows servers to pass Authorization data to the script,
...
if the server did not use the information contained therein.
See 6.1.5 and 11.2 of the proposed spec.
2000-10-27 10:26:57 +00:00
Sascha Schumann
055efb70c3
Handle cookies and make use of php_handle_auth_data.
2000-10-27 10:19:40 +00:00
Sascha Schumann
e6dd64e96e
Use php_handle_auth_data
2000-10-27 10:19:06 +00:00
Andi Gutmans
2946f87f00
- Fix new -m on Windows
2000-10-26 23:50:17 +00:00
Mathieu Kooiman
717e934a88
Added -m (Shows list of modules) to commandline..
2000-10-26 22:31:06 +00:00
Sascha Schumann
3a263dcd99
Handle special queries.
...
Apache's default handler does not seem to handle flushes correctly yet.
One more project..
2000-10-26 21:23:20 +00:00
Sascha Schumann
d504de0f78
An Apache 2.0 Filter for PHP, completely from scratch.
...
TODO:
POST, cookies, "flushing", finalizing config framework (it works),
http auth, PHP Hooks (apache_sub_req is there).
Note that this code depends on some other commits which are pending.
2000-10-26 17:55:05 +00:00
Rasmus Lerdorf
bccdaff6d1
Move server_filter to an extension-specific global
2000-10-23 00:52:11 +00:00
Rasmus Lerdorf
3c92f6bb50
Output function now passes the data onto the next filter in the chain
...
Clean up some variables - bb = bucket brigade, b = bucket
2000-10-22 16:56:08 +00:00
Rasmus Lerdorf
8f494c2ad0
Code to flatten Apache 2.0 bucket brigades
2000-10-22 16:03:53 +00:00
Rasmus Lerdorf
69d704622d
Woops, get rid of some crap
2000-10-22 14:05:29 +00:00
Rasmus Lerdorf
02f599ead5
The start of an Apache 2.0 module
2000-10-22 14:01:18 +00:00
Daniel Beulshausen
7883ddaf51
i'll place the reg file in the win32 folder
...
cause it doesn't really fit in this folder
2000-10-22 13:48:43 +00:00
Frank M. Kromann
878e348ff9
Adding type cast to remove compiler warning
2000-10-20 19:08:59 +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
Sascha Schumann
0fd6a7ed18
Provide basic auth info to scripts.
...
Protect shutdown handler from being called multiple times.
2000-10-11 19:40:56 +00:00
Andi Gutmans
f3232e99c3
- Commit Kristian's PHP 3 patch to PHP 4. Kristian I hope it's also the
...
same here.
2000-10-11 17:48:44 +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
38423a895b
- Fix request_uri to take it's value from SCRIPT_NAME if PATH_INFO is not
...
defined
2000-10-03 13:02:30 +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
Daniel Beulshausen
abbfbf18bc
added tsrm dir to include path, and release_ts_inline to lib path
2000-09-26 11:23:56 +00:00
Sascha Schumann
cd151feb19
#include "SAPI.h" once
2000-09-26 10:58:56 +00:00
Sascha Schumann
8ef52cabcf
Cleanup
2000-09-26 10:58:42 +00:00
Ben Mansell
fd81040420
(Zeus-specific) Don't GetServerVariable() for vars which Zeus doesn't use
2000-09-19 17:43:11 +00:00
Ben Mansell
4208c264d7
Fixed bug which could truncate PHP_SELF
2000-09-19 17:34:53 +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
Zeev Suraski
4396093666
Fix ISAPI compilation
2000-09-04 20:46:46 +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
Sascha Schumann
e97c8ff013
Set SG(request_info).path_translated to the path of the main script.
2000-08-29 15:09:44 +00:00
Sam Ruby
4a915571f5
Add reflect.java to the list of java classes to be compiled
2000-08-29 01:42:58 +00:00
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
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
Anthony Whitehead
678508b426
Added changes suggested by Stanislav Borutsky with respect to NSAPI_PUBLIC.
2000-05-31 14:20:57 +00:00
Sascha Schumann
b470fe138b
The last line added '-I' to INCLUDES, causing all SAPI modules but NSAPI
...
failing to build.
2000-05-31 13:15:58 +00:00
Anthony Whitehead
c6449f307a
Altered NSAPI autoconf to check for location of include files automatically, tested for Netscape 3.x and iPlanet 4.x.
...
Added very basic variable support for usefull things such as PHP_SELF. I'll extend this to supply this rest of the variables soon.
Commited a patch to activate ZTS in the NSAPI module, this patch comes from
Jayakumar Muthukumarasamy.
2000-05-30 13:20:18 +00:00
Andi Gutmans
8c82566b48
- Fix problem in sessions module under Win32. Need to use ; as an options
...
- delimiter in save_path instead of :.
2000-05-27 16:38:49 +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
1895a09749
Only fetch globals if it's necessary (which it usually won't be)
2000-05-25 14:43:30 +00:00
Thies C. Arntzen
e319b5f6a5
@- ignore_user_abort() & friends should now work in CGI mode as well.
...
@ (Patch by daniel.braun@ercom.fr )
2000-05-25 07:01:34 +00:00
Hartmut Holzgraefe
22bfb799a7
-i, -v, -h and -? execution pathes didn't flush the output buffer
...
on exit, resultiong in no output at all when "output-buffering=On"
( BUG id#3420 )
2000-05-22 22:49:18 +00:00
Ben Mansell
d0fd31018b
Fixed check for Zeus under Solaris (/bin/sh doesn't understand '!')
2000-05-22 14:39:33 +00:00
Sam Ruby
767ea7a7e4
use simpler foreach instead of while
2000-05-21 11:26:26 +00:00
Zeev Suraski
e043439ff6
Update the license with the new clause 6
2000-05-18 15:34:45 +00:00
Sascha Schumann
33789f8cdf
Later AOLserver releases will copy the include to the installation dir.
2000-05-18 13:10:13 +00:00
Sascha Schumann
4a4d185637
Fix build against recent thttpd versions
2000-05-17 17:04:46 +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
Sascha Schumann
8ab33a4d13
Use "mkdir -p" instead of "test -d || mkdir" where possible
2000-05-15 16:02:43 +00:00
Ben Mansell
10503a3b92
Define PHP_SELF properly with Zeus+ISAPI
2000-05-15 12:40:12 +00:00
Zeev Suraski
7fc980e1fa
Please maintain consistency in these names... :)
2000-05-14 16:09:32 +00:00
Zeev Suraski
fb20aee667
- Fix a crash bug in case output is generated in the Apache module while
...
in request_shutdown
2000-05-14 16:05:25 +00:00
Sam Ruby
c82eca90f4
Fix typo - thanks to Christian Wenz <christian.wenz@stud.tu-muenchen.de>
2000-05-13 15:26:28 +00:00
Sam Ruby
c32bba9644
build error on Unix
2000-05-11 10:39:28 +00:00
Shane Caraveo
fdb62f9ce7
nsapi now compiles under win32, untested
2000-05-06 23:05:29 +00:00
Shane Caraveo
5797876236
oh boy! apache-win32 works!
2000-05-06 17:59:34 +00:00
Andi Gutmans
0d194ec80b
- Fix problem with sapi_globals being used before it is initialized.
2000-05-05 07:21:48 +00:00
Andi Gutmans
198537b70f
- Make Windows compile again.
2000-05-05 07:18:50 +00:00
Zeev Suraski
0b33ac7627
- Add -z and -g switches to the CGI
2000-05-04 13:42:21 +00:00
Sascha Schumann
d0f3764ee2
Change reentrancy API to always use the php prefix.
...
Check for the declaration of reentrant functions, so that we can use
them in non-ZTS mode on all platforms.
2000-05-04 10:38:17 +00:00
Shane Caraveo
cad04f5579
more apachewin32 work. much better now, but still crashing in zend_execute. At least it's getting the file open now though.
2000-05-04 03:28:34 +00:00
Sascha Schumann
7613e064f8
Remove trailing empty lines
2000-05-01 22:38:42 +00:00
Sascha Schumann
0d36199cf9
Large test commit IV
2000-05-01 22:04:52 +00:00
Sascha Schumann
de2cea47c0
Large commit test III
2000-05-01 22:00:09 +00:00
Rasmus Lerdorf
a3c17cf766
Add initial NSAPI module from Jayakumar Muthukumarasamy
...
@Add initial NSAPI module from Jayakumar Muthukumarasamy
2000-04-30 17:28:24 +00:00
Shane Caraveo
0fc8ff61b2
zeroing the variables fixes one crash...now crashes on memory allocation during zend_compile_files
2000-04-30 04:56:48 +00:00
Shane Caraveo
c7e2d8ef35
sorry, do comments right
2000-04-30 04:21:52 +00:00
Shane Caraveo
8d3ce80f48
apache module now compiles under win32, apache loads, but crashes on line 1167 main.c on page request
2000-04-30 04:15:26 +00:00
Sascha Schumann
953fe189da
Overall UNIX build system improvements:
...
* Makefile header is now completely dynamic
* Absolute paths in (top_)?(src|build)dir and VPATH
(fixes Tru64 support)
* VPATH does not contain variables anymore
(fixes UnixWare support)
2000-04-30 03:20:09 +00:00
Andi Gutmans
9aba6a94d3
- Another PHP_WIN32 patch
2000-04-20 13:43:48 +00:00
Andi Gutmans
f9e9cab7ac
- Change to PHP_WIN32
2000-04-20 13:23:19 +00:00
Thies C. Arntzen
0540bbe5af
improve fix
2000-04-20 07:35:22 +00:00
Frank M. Kromann
429cf808e6
SIGPIPE is unknown on WIN32 platforms
2000-04-19 17:28:23 +00:00
Thies C. Arntzen
19a9577901
ignore SIGPIPE in standalone-mode so that one can actually use fsockopen() *and* have the remote side close the socket whithout PHP dying!
2000-04-19 15:37:43 +00:00
Zeev Suraski
a81e6bc04e
author fixes
2000-04-19 15:21:22 +00:00
Zeev Suraski
708811184d
Improve performance of the PHP_SELF registration under ISAPI
2000-04-19 15:15:33 +00:00
Frank M. Kromann
2e2642cfb3
Adding $PHP_SELF variable for compatibility with other platforms
2000-04-15 19:20:43 +00:00
Sascha Schumann
d748c0827d
SECTION is not defined in info.h anymore
2000-04-15 17:41:25 +00:00
Sascha Schumann
5d72b491c3
Support install directories other than srcdir/root
2000-04-15 17:41:02 +00:00
Sascha Schumann
b128f39837
Add documentation on how to install PHP in AOLserver
2000-04-15 17:40:39 +00:00
Andi Gutmans
c9911a151e
- Change PHP_ to V_ (directory & file functions)
2000-04-15 14:28:48 +00:00
Sam Ruby
a4016620bf
Oops - remove debug statement
2000-04-13 19:05:01 +00:00
Sam Ruby
5424369f3a
match changes to Tomcat example
2000-04-13 19:02:40 +00:00
Rasmus Lerdorf
efabab1a34
Fix for bug #4125
2000-04-13 03:35:02 +00:00
David Hedbor
5f883ac86d
- Fixed a couple of POST problems.
...
- Use virtual path functionality when available, to set the cwd of the
script to it's own directory prior to starting it.
- Fixed a bug in php_roxen_sapi_header_handler.
2000-04-12 22:59:46 +00:00
Ben Mansell
67f867311b
@- Zeus Webserver support (version 3.3.6+) for ISAPI
2000-04-12 09:48:26 +00:00
Sam Ruby
93f9fc77ad
Eliminate warning if virtual cwd is specified
2000-04-11 00:30:33 +00:00
Zeev Suraski
85e9d69f23
@- Fixed several problems with the PATH_TRANSLATED and PHP_SELF under Apache
...
@ (Paul Gregg & Zeev)
2000-04-08 11:16:19 +00:00
Colin Viebrock
adc5bbc925
last one ... promise
2000-04-07 17:09:18 +00:00
Colin Viebrock
d02a351061
typo
2000-04-07 17:04:57 +00:00
Colin Viebrock
02c3eb2bd5
typo
2000-04-07 17:02:01 +00:00
Colin Viebrock
9130f05d08
prettying
2000-04-07 16:50:55 +00:00
Colin Viebrock
86cff779c3
*** empty log message ***
2000-04-07 16:46:59 +00:00
Colin Viebrock
5628b3f0ab
more prettiness
2000-04-07 16:41:19 +00:00
Zeev Suraski
7c70003d22
The ISAPI module was incompatible with the CGI fix, which ruined POST's
2000-04-05 18:06:13 +00:00
Sam Ruby
8372b2baf1
fix typo: wrong variable name
2000-04-05 12:15:57 +00:00
Sam Ruby
c56888da7c
look for Tomcat binaries too
2000-04-05 09:47:34 +00:00
Sam Ruby
5c40dfa374
Define PHP_SELF in sapi/servlet.
...
Reported by Lim Swee Tat <limst@ncscom.sg>
2000-04-05 09:06:05 +00:00
Sam Ruby
617e1b054c
test -e doesn't exist on Solaris - substituting test -d
2000-04-03 15:29:39 +00:00
Andi Gutmans
d8e64d623e
- This version of chdir_file should be compatible with the Apache one.
2000-04-02 19:45:02 +00:00
Sam Ruby
34933225f6
Accomodate back level (JSDK 2.0) implementations
2000-04-01 17:57:42 +00:00
Sam Ruby
8a64f51101
Use C style comments, per the CODING_STANDARDS
2000-03-31 00:53:45 +00:00
Sam Ruby
57b4e1a3ee
fix indentation (this project has tabstop=4!)
2000-03-30 23:35:55 +00:00