clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 19:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,389 Commits 493 Branches 1,365 Tags 848 MiB
ad7facdf2b
Commit Graph

1218 Commits

Author SHA1 Message Date
Sascha Schumann
b9135d74e9 some system headers (irix) define sa_len 
prefix sa_len with x
 2002-10-26 15:47:22 +00:00
Derick Rethans
d82565fb7a - Fix build 
#- Jan, please TEST! before committing :-)
 2002-10-25 14:33:46 +00:00
Jan Lehnardt
e431d6a1c9 - alphabetical output for php -h (cli) 2002-10-25 09:32:32 +00:00
Jan Lehnardt
ed29169f91 - alphabetcial output for php -h (cgi) 
- cosmetics
 2002-10-25 09:28:55 +00:00
Sascha Schumann
0a80a78670 thttpd initializes contentlength to -1, so we need to transfer that to 0 
for SAPI/PHP.  Otherwise, SAPI will try to read (unsigned long) -1 bytes
from the connection.
 2002-10-25 01:10:50 +00:00
Sascha Schumann
d464b8164c add missing {} 2002-10-24 16:04:31 +00:00
Derick Rethans
1f9f9244eb - whitespace 2002-10-24 14:01:39 +00:00
Sascha Schumann
1e3e07173b Improve shutdown-behaviour 
Noticed by: Anantha Kesari H Y
 2002-10-24 13:25:57 +00:00
Derick Rethans
337649a5f2 *** empty log message *** 2002-10-24 13:18:27 +00:00
Sascha Schumann
2909e5c9c9 centralize #include "build-defs.h" and drop (sometimes inconsistent) other 
instances
 2002-10-24 13:15:49 +00:00
Moriyoshi Koizumi
f2f19761a5 Forgot this one. 2002-10-23 18:34:57 +00:00
Sascha Schumann
d554b8d3ab Maintain appropiate line breaks 2002-10-23 10:11:38 +00:00
Yasuo Ohgaki
d253364a13 Make CLI behave like other moder scripting languages. 2002-10-23 01:21:40 +00:00
Ilia Alshanetsky
5c53cdafcb Fixed a bug that caused the values of options/flags set via 
httpd.conf/.htaccess and other apache methods to contain a \0 as part of the
value.
 2002-10-22 14:02:14 +00:00
Ilia Alshanetsky
f7b15b0611 Added support for 'engine Off' directive 
Added support for 'none' option for *_value options.
 2002-10-22 12:20:12 +00:00
Hartmut Holzgraefe
c4cb92229c this will be handled elsewhere 2002-10-21 20:20:08 +00:00
foobar
9d21dd450d - Moved CGI specific lines from configure.in to sapi/cgi/config9.m4 
which is 'executed' last of the SAPI config.m4's.
- Added --disable-cgi option. (was possible only with above change)
- Made the sed check to not test for the possibly working sed on Solaris
  since that would make the test quite useless. (compile would still fail)

# That sed check is not enabled yet..need to know whether we fail
# during configure or just put out a warning about possible non-working
# sed. As even plain ./configure doesn't work in most cases, I think
# it would be better to just fail during configure and let the users
# fix their paths/install GNU sed.
 2002-10-21 03:12:27 +00:00
Ilia Alshanetsky
8361687a4a Fixed a bug with .phps handler. 2002-10-16 20:45:36 +00:00
Edin Kadribasic
4f9b61aa9f Respect INSTALL_ROOT var. Thanks to Jani for catching this one. 2002-10-14 22:18:35 +00:00
Derick Rethans
1bb702e403 - Revert, got tricked by a stale object file 2002-10-14 11:59:58 +00:00
Edin Kadribasic
06484d6eb2 Install lib into $(prefix)/lib. 
Make $(prefix)/lib before trying to copy the lib into it.
 2002-10-14 09:05:28 +00:00
Derick Rethans
092f78fc28 - Fix CLI 2002-10-14 06:58:57 +00:00
Sascha Schumann
47a1421d89 Redo the patch on Linux, the cygwin diff seems to be a bit broken. 2002-10-13 11:54:08 +00:00
Sascha Schumann
356f7503fa PHP + thttpd (+IRCG) build using CYGWIN now 2002-10-13 11:50:16 +00:00
Sascha Schumann
4f61b16768 Remove set .x 2002-10-13 11:28:34 +00:00
Sascha Schumann
240cdb743e Use if block rather than an or expression 2002-10-13 11:28:06 +00:00
Shane Caraveo
69f56e8c4a make fastcgi usage threadsafe, ready for future multithreaded fastcgi implementation 
get rid of environment overwriting but hooking into php's environment function
set $_ENV correctly for mod_fastcgi
add -b to specify binding for fastcgi
new readme file with information for running under apache2.0 and iis
 2002-10-13 09:40:44 +00:00
Shane Caraveo
acb9bc95e3 fixes for unix, untested 
remove exit calls
fix a couple function definitions
 2002-10-13 08:34:27 +00:00
Shane Caraveo
2b40a0f2a3 fix shutdown issues 2002-10-13 07:23:17 +00:00
Shane Caraveo
bfd3efcbd3 fix invalid handle issue that shutdown php fastcgi prematurly 
fix checking os name for impersonation
 2002-10-13 05:55:03 +00:00
foobar
068907c9bc - Removed sapi/fhttpd (this webserver is dead) 2002-10-12 23:02:43 +00:00
foobar
534ad6f38f Use AC_ARG_WITH instead of PHP_ARG_WITH. 2002-10-12 03:10:04 +00:00
foobar
ac950497a6 Fix typo 2002-10-12 02:50:16 +00:00
foobar
ba3730c2c8 ws fix 2002-10-12 01:48:47 +00:00
Edin Kadribasic
67da691a13 Added .cvsignore and CREDITS. 2002-10-12 01:30:52 +00:00
foobar
204b3b5fbd Add the proper install lines. 2002-10-12 01:18:04 +00:00
foobar
7a3f2eb63b Default to shared. 2002-10-12 00:54:53 +00:00
foobar
49488cfd0d - Removed the unnecessary extra configure option --enable-shared-embed 
- Changed --enable-embed to accept parameters shared/static and default
  to static build.
 2002-10-11 23:28:01 +00:00
Rasmus Lerdorf
204c64e57f zlib.h being included before ssl.h needs to be handled here too 2002-10-08 00:13:56 +00:00
Sebastian Bergmann
8684c06b6d Add note about javax.servlet package. 2002-10-06 06:27:13 +00:00
Ilia Alshanetsky
29be52fbfb A slightly better content-type check. 2002-10-04 21:31:34 +00:00
Ilia Alshanetsky
5f67f05d92 Added a note on how to enable .phps support. 2002-10-04 21:22:13 +00:00
Ilia Alshanetsky
9f2b70d507 Added .phps support to Apache 2. It can be enabled by adding 
AddType application/x-httpd-php-source .phps
to httpd.conf
 2002-10-04 21:15:59 +00:00
Derick Rethans
9b517c4b93 - Revert changed to implicit_flush behavior. The new behavior was not 
intended in the first place.
 2002-10-03 10:35:33 +00:00
Yasuo Ohgaki
b52edbddf9 Shouldn't enable implicit_flush like this. 
Most problems are fixed. If you find internal function that does
not follow my comment, please fix it or let me know.
 2002-10-03 09:57:53 +00:00
Ilia Alshanetsky
01830c0d27 Added missing TSRMLS_DC to php_apache_lookup_uri() 2002-10-03 01:28:04 +00:00
Ilia Alshanetsky
ca0aced7c9 Added apache_response_headers(), apache_note(), apache_getenv() and 
apache_setenv() functions.
The getallheaders() is renamed to apache_request_headers() and an
getallheaders() is aliased to it.
Added a better error reporting mechanism to apache_lookup_uri() and virtual().
 2002-10-02 21:22:44 +00:00
foobar
350340241c Possible fix for #19290 2002-09-29 22:24:20 +00:00
Sascha Schumann
e6e54605b7 Follow Yasuo's suggestion and build sapi program's under the sapi-specific 
directory.

Move sapi-specific makefile fragments to their respective directory.

Create an embed sapi module which resides in its own dir now.
 2002-09-29 16:22:49 +00:00
Edin Kadribasic
4be735db9e Those two have enough credits already :) 2002-09-27 12:15:13 +00:00
Colin Viebrock
c7c275b741 fix phpinfo() output for better browser BC 2002-09-26 17:54:54 +00:00
Ilia Alshanetsky
44d42b8e13 Fixed bug #17466 2002-09-23 18:51:34 +00:00
David Reid
8dde690042 Allow this to build on beos with it's bizarre linking. 2002-09-23 17:40:04 +00:00
Sascha Schumann
1f18eaadee Force /nocache/ entities to be delivered completely, even if a 
broken proxy ignores our anti-cache headers and sends an IMS request.
 2002-09-23 15:41:44 +00:00
Zeev Suraski
d31604997b We leak quite a few things intentionally, if you want to debug it - enable 
explicitly please..
 2002-09-23 11:35:22 +00:00
Ilia Alshanetsky
8a1556b3a1 Fixed bug #17662 2002-09-23 04:10:25 +00:00
Sascha Schumann
625e7b202b Use generic getnameinfo for address-to-name translation, if available. 
This adds support for IPv6 addresses.
 2002-09-23 00:49:12 +00:00
Sascha Schumann
c74f96333f Immediately unmap /nocache/ entries, so that the mmc cache does not get 
polluted too much.
 2002-09-21 17:23:15 +00:00
Ilia Alshanetsky
fd094b5b1e Fixed bug #15038, original patch by: phpman@toowards.com 2002-09-21 15:42:33 +00:00
Zeev Suraski
b23adfb43b Fix double initialization 2002-09-21 01:53:15 +00:00
Colin Viebrock
14a6cc8847 Change phpinfo() to use CSS styling instead of HTML code. 
It doesn't render as nicely as it used to on older browsers, but it
does result in smaller files, and opens the door to using your own CSS
to style it differently.

There is a patch to Zend/zend_ini.c, but I don't have enough Karma, so
Derick has the patch.
 2002-09-19 21:57:25 +00:00
Zeev Suraski
76312b4508 another startup initialization fix - only ISAPI and CGI SAPI's tested, 
minor compile buglets might occur in other SAPIs, but should be trivial
to fix...
 2002-09-18 21:57:42 +00:00
foobar
55362251c8 Should fix #19425 2002-09-16 13:13:52 +00:00
Dan Kalowsky
7dd7d39385 Fix for bug #19290 
# Untested
 2002-09-08 18:13:56 +00:00
foobar
3bf7519210 @- Added --disable-all configure option. (Jani) 2002-09-04 18:47:28 +00:00
Marcus Boerger
0b25d07f15 Fix headers when default content type is used. 
#THIS fixes the problems with error_log()
 2002-09-04 15:30:56 +00:00
Jan Lehnardt
298ae37e8c - prepare non-html phpinfo output for zend extensions 2002-09-02 20:44:01 +00:00
Christian Stocker
9495fb9d7d @ - Added php.ini option "allow_webdav_methods" to allow handling of 
@   WebDAV http requests within PHP scripts. (chregu)
# More methods (for DeltaV) will follow.
 2002-08-22 07:48:23 +00:00
foobar
91b3644a72 These functions are not used elsewhere. 2002-08-22 00:19:54 +00:00
foobar
8beb1e2237 Fix ZTS build 2002-08-21 23:51:12 +00:00
Dan Kalowsky
57a1181b9a Fix for Bug #18999 2002-08-20 23:04:53 +00:00
Rasmus Lerdorf
f5630aa246 Fix xbithack bug finally (see bug #16515) 2002-08-19 15:52:21 +00:00
Edin Kadribasic
1fb6a30f0f Debug functions should only work in debug mode. 2002-08-19 13:46:39 +00:00
Holger Zimmermann
b79415334e Some minor changes related to Pi3Web 2.0.1. 2002-08-18 15:46:48 +00:00
Stefan Esser
8d2bc70752 make POST requests work again 2002-08-18 13:05:44 +00:00
Holger Zimmermann
93bbc5e531 Removed unused local variable header_line. 2002-08-18 11:05:28 +00:00
Zeev Suraski
9e743e83a5 Fix a NASTY multithreading bug with in the Apache module 2002-08-15 23:59:47 +00:00
Dan Kalowsky
0917902b92 Fix for Bug #9280 with regards to an Expect header. patch submitted by 
Ilia <ilia@prohost.org>
# someone just give the man his php4 karma please!
 2002-08-14 17:15:49 +00:00
Dan Kalowsky
398288f236 Fix for Bug #18794, and probably various others with nsapi 2002-08-14 16:39:26 +00:00
Rasmus Lerdorf
cd9bb8e555 Fix proto 2002-08-13 04:03:20 +00:00
Marcus Boerger
8e7acaca47 change order of initialisation to allow making filename available 
through $_SERVER variables (Bug #18657)
 2002-08-10 22:42:38 +00:00
Dan Kalowsky
9b7cc76300 fix for bug #18794, not checking for actual files 2002-08-08 05:52:15 +00:00
Harald Radi
e84bddf76a dump memory leaks on shutdown 2002-08-07 18:16:44 +00:00
Marko Karppinen
6d80c191bb The link lines don't need any of $DEFS, $INCLUDES, $EXTRA_INCLUDES or 
$CPPFLAGS, right? Removed them. Added frameworks to $COMMON_FLAGS.
 2002-08-06 17:51:24 +00:00
Marko Karppinen
5611c2fc78 Support compiling and linking against Darwin / Mac OS X frameworks 2002-08-06 16:01:34 +00:00
Sascha Schumann
8fd3f14ab1 Fix segfault due to unchecked null pointer 2002-07-26 16:16:12 +00:00
foobar
272913f3d4 - Fixed bug: #18560, the macro was not defined always. 2002-07-25 18:37:16 +00:00
Holger Zimmermann
2771e6d4f6 Removed some outdated lines from init_request_info(). 2002-07-23 17:12:54 +00:00
Marko Karppinen
b231fc0d35 Made PHP_ADD_LIBPATH use the $ld_runpath_switch and changed the Darwin 
link lines in sapi/cli and sapi/cgi to use $NATIVE_RPATHS.
This is a tentative fix for #18450.
 2002-07-21 14:42:01 +00:00
Sascha Schumann
1326c95b29 refine 2002-07-16 16:24:15 +00:00
Sascha Schumann
fa3d840cd1 integrate the public keep-alive patch 
the patch did not handle pipeling at all, so that some code had to be added
from Premium thttpd

persistent connections are supported, if a script sets the Content-Length
header
 2002-07-14 18:01:08 +00:00
Sascha Schumann
b4c28fba7f thttpd blocks in rare circumstances where it cannot write out a small HTTP 
response (happened at customer sites).  The response is now written out
using the standard state machine.

the buffer which is handed to thttpd by php is now simply dealt with as if
it were a thttpd generated response (avoids code duplication).
 2002-07-14 13:48:46 +00:00
Sascha Schumann
402cc031cd make the sapi module hand off a buffer to thttpd for final data delivery, 
instead of blocking the whole process
 2002-07-14 13:10:34 +00:00
foobar
6a42e635ca Needed this to be able to test safe-mode stuff on cmd-line 2002-07-13 04:43:12 +00:00
Sascha Schumann
6d643eb035 Break up the INSTALL_IT line into comprehensible pieces 
and fix a bug related to [..] quotes.
 2002-07-11 14:41:03 +00:00
Sascha Schumann
808f05c205 the variable interpolation was already subject to IFS treatment, 
which resulted in the execution of the foremost directory.

we capture the output before setting IFS now
 2002-07-11 13:33:22 +00:00
Sascha Schumann
ee619493b3 Use a simple IFS; set step to interprete the httpd -v output 2002-07-11 08:44:42 +00:00
foobar
2ca9ae687d - Fix the version check again. 2002-07-07 15:43:45 +00:00
Marko Karppinen
a6eeec28b6 Moved the cgi link line to sapi/cgi/config.m4 and stopped 
using libtool on Darwin on it
 2002-07-04 08:39:11 +00:00
Sascha Schumann
2c3801b979 Generate content-type header, if the user did not specify one of its own. 
Noticed by: Edin Kadribasic <edink@proventum.net>
 2002-07-04 08:13:19 +00:00
Sascha Schumann
b3e562f9ef Add CRLF after complete HTTP reply header 2002-07-03 11:46:37 +00:00
Sascha Schumann
99cfb41da0 Use "Status: %d" instead of "HTTP/1.0 %d X" in the CGI SAPI module 
as per the CGI RFC.

The status notation is incompatible with Apache's non-parsed-header mode
"nph-*", but that has never worked before anyway.  One could make the
format string configurable.

Noticed by: Sebastian Bergmann
 2002-07-03 11:44:48 +00:00
Sascha Schumann
9c876ea01a Add sapi_header_op interface which supersedes the sapi_add_header and _ex 
calls.

Revert the change to the sapi_add_header_ex interface.

Fix various bugs:

1.  header("HTTP/1.0 306 foo");
    header("Location: absolute-uri");

    did not work in combination with several SAPI modules, because
    http_status_line was never properly reset.  And thus, all SAPI
    modules which looked at http_status_line ignored the changed
    http_response_code.

2.  The CGI SAPI did not send out the HTTP status line at all, if
    http_status_line had not been set explicitly by calling
    header("HTTP/1.0 200 foo");
 2002-07-03 10:42:31 +00:00
Marko Karppinen
23de5d1c20 - You don't need libtool to build sapi/cli on Darwin. 
- We don't need libtool to build sapi/cli on Darwin.
- You want the sapi/cli build line to be in sapi/cli, not Makefile.global.
- We want the sapi/cli build line to be in sapi/cli, not Makefile.global.
- He can go about his business.
- You can go about your business.
- Move along.
- Move along. Move along.
 2002-07-01 21:17:39 +00:00
foobar
999d9aa10f Better fix it here too.. 2002-06-29 00:33:02 +00:00
Rasmus Lerdorf
03b76b278e Oops, extra pipe snuck in 2002-06-29 00:12:46 +00:00
Rasmus Lerdorf
02022179c9 Fix for bug #18055 2002-06-28 23:57:15 +00:00
Sebastian Bergmann
836d9c3e9f Mention Apache 2.0.40. 2002-06-28 15:16:28 +00:00
foobar
21debac333 Require 2.0.40 2002-06-28 14:48:37 +00:00
Derick Rethans
2fda2eb4a8 - YAAC: I hope this is the last one! 2002-06-28 14:45:10 +00:00
foobar
f4699170fc Fixed bug: #17491 (honor INSTALL_ROOT) 2002-06-28 09:01:56 +00:00
Sascha Schumann
ee477dbc56 Fix code which makes wrong assumptions about the return value of snprintf. 
The AOLserver module did not use the return value, so simply drop it.
 2002-06-26 07:54:50 +00:00
Rasmus Lerdorf
890e01bebe @ Add runtime Apache2 thread check to ensure we don't run a non-threaded 
@ PHP inside a threaded Apache2 MPM.  (Rasmus)
 2002-06-24 16:04:20 +00:00
Rasmus Lerdorf
8a2ab01744 @ Turn off ZTS if Apache2 is using the prefork MPM. (Rasmus) 2002-06-24 14:51:01 +00:00
Sander Roobol
d279a92242 Made php_admin_value work outside <location> and <directory> blocks. 2002-06-22 15:31:44 +00:00
Andi Gutmans
805a1653f0 - Revert WS changes 2002-06-22 13:59:13 +00:00
Andi Gutmans
85983fe957 - This shouldn't have snuck in. 2002-06-22 13:58:32 +00:00
Andi Gutmans
4216379152 - Stop using persist_alloc(). 2002-06-22 13:53:44 +00:00
Stefan Esser
44a5b43b79 Fixing the same possible memory leak. 2002-06-21 14:47:59 +00:00
Derick Rethans
6869cb3f5a - Added a new parameter to the header() function which overrides the HTTP 
response code.
@- Added a new parameter to the header() function which overrides the HTTP
@  response code. (Derick)
 2002-06-21 09:31:21 +00:00
foobar
f9e492d00b @- Fixed bug with Apache which let PHP_AUTH_* variables to be set when 
@  external basic auth mechanism was used. (Jani)

Fixes bugs: #16653, #14534, #14370
 2002-06-13 22:13:57 +00:00
Edin Kadribasic
11bc56d48b Fix exit code (bug #17733). 2002-06-13 08:38:26 +00:00
Edin Kadribasic
acae873a6b Disable installing pear when --disable-cli is used since pear installer 
needs cli to function.
 2002-06-11 09:35:59 +00:00
Sascha Schumann
5e148e3875 too many flushes are bad 2002-06-08 18:11:03 +00:00
Sascha Schumann
190b65f4a1 Fix build 2002-06-01 17:38:23 +00:00
Andi Gutmans
0d5862d75a - Reapply netware patch 2002-06-01 10:27:51 +00:00
Rasmus Lerdorf
f01a42b499 Put Netware header and comment back in. My CVS revision id got messed 
up somehow.
 2002-06-01 09:54:28 +00:00
Rasmus Lerdorf
b66f48c3ce Oops 2002-05-31 23:52:07 +00:00
Rasmus Lerdorf
6b756ea46c @ Renamed getallheaders() to apache_request_headers() and kept 
@ getallheaders() as an alias to it.  Also added apache_response_headers()
@ which returns the current response headers from Apache.
Renamed getallheaders() to apache_request_headers() and kept
getallheaders() as an alias to it.  Also added apache_response_headers()
which returns the current response headers from Apache.
 2002-05-31 23:49:49 +00:00
Venkat Raghavan S
ecdbaeced1 Removed ugly code done as part of NetWare change, upon Andi's advice. Now, the typecasting is done for all platforms. 2002-05-31 09:07:12 +00:00
Venkat Raghavan S
575e3682f5 NetWare related changes 2002-05-31 04:49:45 +00:00
Cliff Woolley
46eeabccf7 That macro is and always was hopelessly broken, which is why it's 
now deprecated.
 2002-05-30 06:07:28 +00:00
Edin Kadribasic
2d953b348a Merge from cli. 2002-05-26 13:12:30 +00:00
Edin Kadribasic
af5663fa50 Due to the way Zend handles exit() we cannot rely on the return code 
of php_execute_script.
 2002-05-26 12:43:20 +00:00
Edin Kadribasic
190719ab97 Made constants persistent and fixed a memory leak. 2002-05-26 12:20:35 +00:00
Edin Kadribasic
1501657b2f Register STDIN, STDOUT, and STDERR "constants" in cli in cases where 
script itself is not being loaded from STDIN.

This enables constructs like fwrite(STDERR, "Error 42");
 2002-05-24 01:17:37 +00:00
Wez Furlong
64df5577bf Add README and CREDITS... 2002-05-22 00:03:02 +00:00
Wez Furlong
139fd6a8e4 Fix bug when length was queried before the string was converted. 2002-05-22 00:02:35 +00:00
Wez Furlong
3fca69809d Use the GIT for inter-thread marshalling. 2002-05-20 22:22:57 +00:00
Harald Radi
02a13a4ec4 this way it even compiles 
#blame me if i did something wrong, i didn't test it ;)
 2002-05-20 15:38:19 +00:00
Wez Furlong
e754361405 Implement ActiveScript interfaces. 
This allows use of PHP in:
  Client-side script in Internet Explorer
  Windows Scripting Host
  ASP and ASP.NET pages
It's mostly working... give it a go.
You will need to regsvr32 the php4activescript.dll manually.
 2002-05-20 01:35:29 +00:00
Sascha Schumann
d7edeee55f Improve readability of the header send function 2002-05-17 21:22:30 +00:00
Cliff Woolley
8283979afc Allow the version checks for --with-apxs= and --with-apxs2= to work 
with development version of Apache, whose version strings end in "-dev",
eg "Apache/2.0.37-dev".

PR: 17233
Submitted by: Dale Ghent <daleg@elemental.org>
 2002-05-17 08:07:14 +00:00
Cliff Woolley
57a4a7ed39 apache 2.0's apache_lookup_uri() was returning an array rather than an 
object, which contradicted both the documentation and the behavior of the
same function under apache 1.3.

PR: 14999
 2002-05-17 06:32:04 +00:00
Cliff Woolley
78cac2a42e * restore the php_flag and php_admin_flag Apache directives which for 
some mysterious reason never made their way from sapi/apache to
  sapi/apache2filter when it was first written  PR: 16629
* change the allowed locations of php_admin_value (and php_admin_flag to
  match) to ACCESS_CONF instead of OR_NONE to match sapi/apache.  No
  idea why it was ever OR_NONE.  PR: 16489
 2002-05-17 05:16:18 +00:00
Jason Greene
e2c80df0dd Fix fastcgi build, may need more work 
# Sascha, would you mind looking this over?
 2002-05-14 00:07:51 +00:00
Marko Karppinen
5a5767e1d6 Patch by Justin Erenkrantz <jerenkrantz@apache.org> for enabling 
--with-apxs2 build on Darwin. Omitting the change to start linking
with libtool for now, though.
 2002-05-13 21:37:52 +00:00
Jim Jagielski
8006ee79a3 More verbose but more generic error message when we spot multiple 
PHPINIDir directives
 2002-05-13 19:22:27 +00:00
Markus Fischer
965b4c26f1 - Update about CLI default settings and it's weirdness. 2002-05-11 20:33:59 +00:00
Edin Kadribasic
8e15de012a Added copyright notice to php -v output. 2002-05-11 14:26:30 +00:00
Sebastian Bergmann
5192f6432c Patch by Justin Erenkrantz <jerenkrantz@apache.org>. This should be MFHed. 2002-05-11 08:58:20 +00:00
Zeev Suraski
5af649efbd Revert to the old php_ini.c, and reimplement the binary-path searching. 
Should now also work under UNIX (CLI/CGI)
 2002-05-11 03:41:17 +00:00
Zeev Suraski
ce20564d1e whitespace 2002-05-11 03:33:29 +00:00
Zeev Suraski
2d0f07d086 Add missing element 2002-05-11 02:58:43 +00:00
Markus Fischer
ccbadfc111 - Prefix the first version line with 'PHP' so it's easier to use shell tools to 
parse the version number (both CLI and CGI).
 2002-05-10 16:18:00 +00:00
Markus Fischer
bf351e9639 - This affects both CGI and CLI sapi: 
Remove Zend version output from -m switch and move it over to the output of
  the -v switch (-v is supposed to list version numbers, not -m).
 2002-05-10 16:04:03 +00:00
Preston L. Bannister
57c5998ff9 Backed out preceding change. 2002-05-09 23:33:27 +00:00
Preston L. Bannister
d706e224ac Detect when running under IIS and default force_redirect to zero. This This means an explicit php.ini setting is no longer required. 
(No extraneous whitespace changes this time :).
 2002-05-09 21:03:30 +00:00
foobar
42c82bb40d Revert the last patches. 2002-05-09 20:03:36 +00:00
Preston L. Bannister
06f375b1cf Detect when running under IIS and not require explicit setting of force_redirect. 
This means an explicit php.ini setting is no longer required.
 2002-05-09 19:32:39 +00:00
Sander Roobol
7586cdc654 Added the current SAPI to the output of php -v 2002-05-09 09:36:45 +00:00
Rui Hirokawa
f30b722f14 Added conversion support from script character encoding to internal character encoding. This feature is very useful for japanese who uses Shift_JIS encoding because some of characters in Shift_JIS are including '0x5c' and it causes some troubles on Zend parser. This patch is made by Masaki Fujimoto. 2002-05-08 12:33:44 +00:00
Derick Rethans
dedf22f5ad - Added Aaron Bannert as maintainer 2002-05-08 05:17:59 +00:00
Edin Kadribasic
d00252cf38 Update README with register_argc_argv settings override. 2002-05-06 15:49:06 +00:00
Aaron Bannert
8e176a10fc Fix a graceful restart SEGV. We no longer only perform initialization 
on the second pass through the post_config. Now we only avoid the
initialization only on the first DSO load, and on all subsequent loads
we rerun the init code.
 2002-05-05 18:15:33 +00:00
Aaron Bannert
b759322411 Fix an elusive and intermittent startup SEGV. The problem was 
the static string we were using to set an initialization flag
would get remapped to a different location when Apache reloaded
the DSO, causing us to not run our initialization routines.

Submitted by: Justin Erenkrantz <jerenkrantz@apache.org>
Reviewed by: Aaron Bannert (I added the big comment too)
 2002-05-05 18:11:41 +00:00
foobar
5f13f4ecb7 Force register_argc_argv=On for CLI 2002-05-05 17:11:04 +00:00
Marko Karppinen
b7e50782b7 Well that didn't last long! (Reverting previous.) 2002-05-05 09:52:39 +00:00
Marko Karppinen
32ff990c68 Prelim. patch to enable apache2filter to link on Darwin. 
Submitted by: Justin Erenkrantz <jerenkrantz@apache.org>
Reviewed by: markonen
# A stopgap measure while we try to find a "real"
# solution, if one exists.
 2002-05-05 09:40:31 +00:00
Sascha Schumann
1ed3f698fe ap_php_optopt is set but never used 2002-05-04 17:27:18 +00:00
Sander Roobol
7a64b2b7e5 Fixed some minor typos 2002-05-02 17:19:42 +00:00
Sebastian Bergmann
edba077000 Fix build. 2002-05-02 15:18:26 +00:00
James Cox
ba85302e79 updated cgi warning notice. 2002-05-02 14:55:12 +00:00
foobar
2c8e8e0406 Fix build when openssl is enabled. 2002-04-28 04:53:40 +00:00
Sascha Schumann
12ba44827a be a bit more verbose about what is wrong 2002-04-26 21:26:47 +00:00
Sascha Schumann
e2ad07fdcf Fix external builds 2002-04-26 10:23:16 +00:00
foobar
492efe963f - Fix for bug: #16791. (more reliable test) 2002-04-26 03:07:16 +00:00
Aaron Bannert
b2f9b6fb16 Apache does a full load, unload, load cycle for each DSO module. 
This patch makes sure that any startup actions that are performed
for PHP don't happen until the second load (the second call to
the post_config hook), and it also prevents subsequent calls
to the initialization routines.

Suggested By:   Cliff Woolley

PR: 16475, 16754
 2002-04-24 00:55:38 +00:00
Hartmut Holzgraefe
4852dd3569 apache_child_terminate() returns status as bool 
proto fixes
 2002-04-23 11:40:19 +00:00
foobar
f54f199906 This was not supposed to be uncommented..yet. 2002-04-23 03:02:20 +00:00
foobar
dace2eca03 Part 4 of apache sapi build fixes: 
- Fixed many conflicts caused by bogus includes, e.g the infamous XtOffset
  redefinition warning is gone now.
 2002-04-23 03:01:30 +00:00
foobar
eb18c5c38c Part 3 of static apache build fixes: 
- Use the PHP_CFLAGS when compiling the php4 module in apache tree.
- Use the apache include dir only when compiling sapi/apache
  o Fixes the fnmatch.h issue Wez complained about :)
 2002-04-23 02:58:54 +00:00
Jim Jagielski
a6117a874e Typo in error string 2002-04-22 20:00:41 +00:00
Marko Karppinen
42555b189e Refine the OS X support a bit 2002-04-22 15:37:54 +00:00
Marko Karppinen
2cd85ac084 Merged the Mac OS X compile changes from the Apache 1.3 SAPI. 
--with-apxs2 should now work on Mac OS X / Darwin.
# Not tested, though. So shoot me! :)
 2002-04-22 15:25:17 +00:00
Edin Kadribasic
6c491a5654 Reverting my previous patch. 2002-04-22 12:00:53 +00:00
Edin Kadribasic
8509772d93 Added ..\..\..\php_build\lib\apache2 to libpath and 
..\..\..\php_build\include\apache2 to includepath
 2002-04-21 20:36:08 +00:00
Derick Rethans
68ca74c371 - Gaurd for problems in fault servers (fixes problem with Sambar 5.2) 2002-04-18 22:51:23 +00:00
Aaron Bannert
5ab179e830 Document the new PHPINIDir directive in the apache2filter/README. 2002-04-18 22:47:13 +00:00
Aaron Bannert
3aa8a9b62b This patch implements a new Apache2 directive called PHPINIDir that 
allows the specification of the php.ini directory from within the Apache
configuration. If left unset, the default is to defer to the hard-coded
php paths. When set, the supplied path is made relative to Apache's
internal ServerRoot setting.

Example:
PHPINIDir "conf"
# PHP will now look in the ServerRoot/conf directory for the php.ini file
 2002-04-18 22:10:57 +00:00
Aaron Bannert
d11ee7c1ea Fix an intermittent SEGV when an error bubbled up from PHP before our 
server context was set. Now if that happens we simply don't log against
any particular server config (vhost).

Obtained from bug report by:  Balazs Nagy <js@iksz.hu>
 2002-04-18 16:34:06 +00:00
Aaron Bannert
2e3ce44c80 It makes more sense to do the null-pointer check *before* trying to use it. 
(Also fix a typo that Cliff pointed out: "safe" --> "save".)

Obtained from:  Ryan Morgan <rmorgan@covalent.net>
 2002-04-16 17:41:28 +00:00
foobar
b21931e6c3 ws fixes 2002-04-14 12:38:33 +00:00
foobar
7c2811e1ab Make it possible to actually disable the CLI.. 2002-04-14 03:57:59 +00:00
foobar
0fa1516483 - Prevent users from trying to make a static build with Apache2 using 
--with-apache

# I have working --with-apache2 stuff also..need to test it a bit more
# before committing it..
 2002-04-13 05:58:29 +00:00
foobar
f81166f34e - Added checks to prevent building the DSO with wrong configure option. 2002-04-12 22:59:07 +00:00
Aaron Bannert
bf8bb929ac Fix a typo and a build error detected by the lovely HPUX11 ANSI C compiler. 2002-04-12 22:25:29 +00:00
Yasuo Ohgaki
439b56842f CGI/CLI take file and dir for -c option by this. 
@ Both 'file' and 'path to php.ini' is allowed for "-c" cli/cgi option. (Yasuo)
 2002-04-12 00:20:29 +00:00
Aaron Bannert
22fb507325 Fix a problem where php-generated data was pushed down the entire output 
filter chain instead of just down the rest of the chain. This fix will
speed up some unnecessary overhead introduced in the last patch.

Suggested by:  Cliff Woolley <jwoolley@apache.org>
 2002-04-11 20:34:56 +00:00
Aaron Bannert
27a5b380cf PHP filters and Apache 2 aren't quite a perfect match yet, so we have 
to do some trickery with the server_context to make sure it is always
valid within the current thread.

This patch makes sure the server_context is created in apache's
post_read_request hook phase, and then registeres a cleanup that
will NULL out the server context when the request goes out of scope.
Then, inside the output filters, if the server_context is null we
throw an error. Finally, instead of saving the output filter in
the server_context, now we store the entire request_rec pointer
in there.

POST bodies appear to be working now, although they are very inefficient.
The input filter is still just realloc()ing for whatever data comes
down the input pipe, and then sending this to PHP. This means that
we are doing some really nasty memory management on big POST bodies.
For now this it allows for unlimited input bodies, which means that
a big POST could potentially DoS a box by making it run out of memory.
We might want to put a limit on here just in case, at least until
we figure out how to consume input data more efficiently into php.
 2002-04-11 19:25:08 +00:00