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