foobar
2ca9ae687d
- Fix the version check again.
2002-07-07 15:43:45 +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
Stefan Esser
44a5b43b79
Fixing the same possible memory leak.
2002-06-21 14:47:59 +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
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
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
Zeev Suraski
ce20564d1e
whitespace
2002-05-11 03:33:29 +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
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
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
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
Sebastian Bergmann
b0eb69ecc0
Fix output directory.
2002-04-06 15:37:08 +00:00
Marko Karppinen
676afb33b8
Enable --with-apxs build on Mac OS X. We build an MH_BUNDLE instead of
...
an MH_DYLIB. As all PPC code is relocatable, we don't use the libtool
based shared build but go a static route. Goodbye libtool!
# I'm committing this to enable widespear testing.
# Anyone have any ideas on how to easily backport this to 4.2.0?
2002-03-30 03:17:25 +00:00
Marko Karppinen
60663c1f64
Prepare for MH_BUNDLE build on Mac OS X / Darwin
2002-03-29 19:25:55 +00:00
Sascha Schumann
9d9d39a0de
Please welcome the new build system.
...
If you encounter any problems, please make sure to email sas@php.net
directly.
An introduction can be found on
http://schumann.cx/buildv5.txt
2002-03-07 14:20:02 +00:00
Derick Rethans
a6738260af
- Fix for bug #15572 (Patch by Ralf Nyrén <ralf.nyren@educ.umu.se>)
2002-03-04 17:46:19 +00:00
Sebastian Bergmann
90613d2282
Maintain headers.
2002-02-28 08:29:35 +00:00
jim winstead
63669c6a64
make it more clear that --with-apache and --with-apxs only work with apache 1.x.
2002-02-25 18:27:13 +00:00
Hartmut Holzgraefe
052d5fc85d
proto fix
2001-12-15 14:23:07 +00:00
Sebastian Bergmann
38933514e1
Update headers.
2001-12-11 15:32:16 +00:00
Hartmut Holzgraefe
df6f8ba35a
proto fix
2001-12-04 22:14:28 +00:00
foobar
f43b57190c
Added missing cvs ids and unified configure messages.
2001-11-30 19:01:32 +00:00
foobar
41b21156cc
Fixed bugs: #14034 , #11647 (can not find any others)
2001-11-19 00:51:06 +00:00
Rasmus Lerdorf
95dff71df7
This made no sense before. Hide Authorization in getallheaders() but
...
display it from phpinfo()? Ouch!
@ Hide Authorization header from phpinfo() output in safe_mode (Rasmus)
2001-10-21 00:03:55 +00:00
Thies C. Arntzen
838a7a9566
make it work again
2001-10-12 07:50:52 +00:00
Stig Bakken
99687096ca
* fix default path in configure help text
2001-10-10 16:14:25 +00:00
Derick Rethans
e4ebe9f1ff
- Changed <br> to - in PHP_INFO output.
2001-10-09 09:41:10 +00:00
Jeroen van Wolffelaar
eb38ca844b
Undo Z_ subst for sapi and ext/yaz
2001-09-27 20:01:23 +00:00
Jeroen van Wolffelaar
c033288573
Back-substitute for Z_* macro's. If it breaks some extension (the script isn't optimal, it parses for example var->zval.value incorrect) please let me know.
2001-09-25 21:58:48 +00:00
Rasmus Lerdorf
1df380da5a
new apache_setenv()
...
@- add apache_setenv() function for injecting variables into Apache's
@ subprocess_env table.
2001-09-22 10:11:53 +00:00
Daniel Beulshausen
3a386f8684
fix macro + nuke warning
2001-09-17 12:22:35 +00:00
Sascha Schumann
7c161fe069
WS-fix and directly use ap_psprintf instead of sprintf/ap_pstrdup
2001-09-16 16:03:49 +00:00
Thies C. Arntzen
9938137725
fixed memory_peak resetting
2001-09-16 15:45:25 +00:00
Derick Rethans
78747bd2df
- Don't wrap lines... this is annoying while coding.
2001-09-09 13:29:31 +00:00
Rasmus Lerdorf
afa9e65ff4
Damn, went to head instead of the branch - revert
2001-09-06 23:35:39 +00:00
Rasmus Lerdorf
6a2d84ba06
Oops, forgot to add sapi_apache.c to the apache_hooks branch
2001-09-06 23:32:59 +00:00
Sterling Hughes
198e6f3ea7
no need to cast a 'HashTable *' to 'HashTable *'
2001-09-06 22:51:47 +00:00
foobar
e29994166a
WS
2001-08-31 22:03:24 +00:00
Zeev Suraski
6bba521dd3
API update
2001-08-31 14:34:40 +00:00
Daniel Beulshausen
ba761ce9b1
TSRMLS fixes
2001-08-14 17:05:53 +00:00
Thies C. Arntzen
e8e401bc2d
ypo;-)
2001-08-14 08:33:21 +00:00
Zeev Suraski
6ecae422c4
Use zend_first_try
2001-08-08 14:01:22 +00:00
Sascha Schumann
480ffb3d75
more tsrm cleanup
2001-08-05 16:43:57 +00:00
Sascha Schumann
373b3e101e
more tsrm cleanup -- output.c is not doing any fetches anymore
2001-08-05 15:55:43 +00:00
Sascha Schumann
8aef193056
more tsrm cleanup
2001-08-05 15:29:47 +00:00
Zeev Suraski
1159c84ab7
- TSRMLS_FETCH work
...
- whitespace fixes
2001-08-05 01:43:02 +00:00
Sebastian Bergmann
b99798fda0
Another one bites the dust.
2001-08-04 17:07:16 +00:00
Sebastian Bergmann
b5763a70a6
Remove duplicate TSRMLS_FETCH() call.
2001-08-04 17:02:43 +00:00
Zeev Suraski
12318a2068
Fix Apache/ZTS build
2001-08-01 22:53:26 +00:00
Zeev Suraski
d76cf1da18
More TSRMLS_FETCH work
2001-07-31 04:53:54 +00:00
Thies C. Arntzen
5f6e3db13f
compile fix
2001-07-30 14:25:29 +00:00
Zeev Suraski
797a079a95
More TSRMLS_FETCH work, and a bit of cleanup
2001-07-30 06:18:13 +00:00
Zeev Suraski
7b1c400631
More TSRMLS_FETCH annihilation (Zend compatibility patch)
2001-07-30 04:58:07 +00:00
Zeev Suraski
1c25b8dd53
Avoid TSRMLS_FETCH()'s, and clean up a bit of stale extern's and layout on the way
2001-07-30 01:56:43 +00:00
Rasmus Lerdorf
15ae74d3ba
Fix typo
2001-07-28 14:01:24 +00:00
Zeev Suraski
dde79b86c5
Build fix
2001-07-28 12:05:15 +00:00
Zeev Suraski
63829bc949
Some more fixes
2001-07-28 12:02:42 +00:00
Zeev Suraski
d87cc976e1
Redesigned thread safety mechanism - nua nua
2001-07-28 11:36:37 +00:00
Zeev Suraski
fe6f8712a4
- Get rid of ELS_*(), and use TSRMLS_*() instead.
...
- Move to the new ts_allocate_id() API
This patch is *bound* to break some files, as I must have had typos somewhere.
If you use any uncommon extension, please try to build it...
2001-07-27 10:16:41 +00:00
Zeev Suraski
536a53356d
Get rid of the redundant global startup code
2001-07-24 20:30:37 +00:00
Sascha Schumann
36be1040eb
Use synchronous php_request_shutdown in the standard case and
...
let the pool cleanup function only become effective, when an
error has occured.
This fixes the problem that the request_conn was already dead
when the request_shutdown was reached.
2001-07-23 01:03:22 +00:00
Zeev Suraski
6fa5ac832f
Fix Apache build
2001-07-21 16:18:03 +00:00
Zeev Suraski
336004f4bc
Improved bailout mechanism, supports nested bailouts a-la try..catch
...
Note: You may *not* return directly from a catch block
2001-07-21 14:27:56 +00:00
Sascha Schumann
e843e8c5f0
Move PHP_TARGET_RDYNAMIC check to global acinclude.m4 and use it
...
in thttpd's config.m4.
2001-06-15 12:53:20 +00:00
Rasmus Lerdorf
81e2cf03ac
Fix folding and clean up some extensions
2001-06-06 13:06:12 +00:00
Martin Kraemer
f2002d3e41
Oops, sorry. I should not have committed this ebcdic fix (which was none)
2001-06-01 12:58:41 +00:00
Sascha Schumann
1ad2a710ab
Use EXTRA_LDFLAGS at this point.
...
I've confirmed that one can build a working Apache DSO module now
(AIX 4.2 with gcc 2.95.2 and Apache 1.3.12).
2001-05-23 21:23:16 +00:00
Martin Kraemer
c96d652843
Fix Basic auth (when under PHP control) for EBCDIC platforms
2001-05-23 15:24:53 +00:00
Sascha Schumann
40245019cc
s/^I/ / and some re-indenting. Also align the APXS checking code
...
with the standard scheme.
2001-05-19 17:13:09 +00:00
Sascha Schumann
e29a1b2230
First try at using Apache's export list when building a DSO.
2001-05-18 20:53:53 +00:00
Zeev Suraski
89c7b891c9
Add missing info
2001-05-17 13:31:45 +00:00
Sterling Hughes
0492f086e7
# Revert the SLS_FETCH() ;)
2001-05-16 18:28:18 +00:00
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
Thies C. Arntzen
169febcdf0
@- Added --enable-memory-usage-info. This creates a new Apache 1.x logging
...
@ directive "{mod_php_memory_usage}n" which will log the peak amount of
@ memory used by the script. (Thies)
2001-05-11 18:17:08 +00:00
Zeev Suraski
910e9d068c
whitespace
2001-05-07 22:02:44 +00:00
Zeev Suraski
d229f82a46
Allow virtual() of PHP files. We may have to improve the detection code a
...
bit, but it worked well on everything I tried.
2001-05-07 11:07:22 +00:00
Sascha Schumann
d8b3bdf3bc
Fix static Apache builds which were broken by the last commit.
2001-04-05 10:56:04 +00:00
Wilfredo Sanchez
cb71c4c2d0
Separate CPPFLAGS from CFLAGS.
2001-04-03 23:30:49 +00:00
Wilfredo Sanchez
0df6e8dd88
Add INSTALL_ROOT variable to specify install location.
2001-04-03 20:59:50 +00:00
foobar
8a26918ed1
Renamed the AC_ prefixed macros defined in acinclude.m4 to PHP_* prefixes.
...
# Heads up people! I tested this before committing but you never know..
2001-03-27 20:35:04 +00:00
Stanislav Malyshev
5c1f7a2f60
Fix off-by-one on config values set from Apache config
...
# It didn't really hurt, since the extra character was always \0,
# but the phpinfo() display came out ugly.
2001-03-13 18:39:38 +00:00
Zeev Suraski
800950c5a7
Avoid using ret uninitialized
2001-03-06 15:10:53 +00:00
Zeev Suraski
559c254f8f
Avoid writing to error_log in case of aborted connections.
2001-03-06 15:00:08 +00:00
Andi Gutmans
eb6ba01d1c
- Fix copyright notices with 2001
2001-02-26 06:11:02 +00:00
Rasmus Lerdorf
0d0a8f55d6
Kill warning
2001-01-22 01:13:49 +00:00
Zeev Suraski
3793dc18f2
Sigh. Even less sleep than I thought :) Really fix it this time.
2001-01-22 01:10:21 +00:00
Zeev Suraski
9a02c9993d
Too much work, not enough sleep... Fix hash lookup
2001-01-22 01:08:28 +00:00
Zeev Suraski
6255a24f1c
Don't overwrite PATH_TRANSLATED if it exists
2001-01-22 00:06:52 +00:00
Daniel Beulshausen
0d258cc523
make threaded apache module build again
2001-01-05 17:00:07 +00:00
Zeev Suraski
43a7643453
Fix last couple of problematic execution paths that could corrupt the INI values
2001-01-03 22:45:11 +00:00
Zeev Suraski
60776dbeeb
Fix Apache module and remove excess elements from the SAPI structure
2001-01-03 11:56:00 +00:00
foobar
c5da386dbd
Fix compile.
2001-01-03 11:39:09 +00:00
Zeev Suraski
bd0ac7fe14
Many patches. I hope I remember them all:
...
- Make sapi_module available to external modules (PHPAPI)
- Make the php.ini path reported in phpinfo() always point to
real full path of the php.ini file
- Optimized the ISAPI module not to read unnecessary server
variables and read necessary variables at most once.
2001-01-02 22:49:31 +00:00
Zeev Suraski
0048312fa6
Fix a few possible bugs:
...
- engine=off in one or more vhosts could propogate to other vhosts
- Under some error situations, the default values for INI directives
could be erroneously replaced for a single request
2000-12-30 00:38:47 +00:00
Daniel Beulshausen
3b20a425c9
added missing SLS_FETCH()
2000-12-14 22:16:21 +00:00
Sascha Schumann
276cb7cdb1
Add apache_child_terminate() and INI setting apache.child_terminate
...
which defaults to 0.
Submitted by: Sam Liddicott <sam.liddicott@ananova.com>
2000-12-13 13:19:56 +00:00
Sascha Schumann
107aa9f71a
Align ZTS handling of globals with common usage
2000-12-10 23:22:20 +00:00
Daniel Beulshausen
d41137fedf
fix win32 apache module
...
# this is ugly, has someone a better way?
2000-12-10 22:40:07 +00:00
Daniel Beulshausen
1f31360f01
fix windows build
2000-12-10 22:06:07 +00:00
Sascha Schumann
0ddb725f91
Axe rest of DAV leftovers and use STD_PHP_INI_ENTRY in the INI section
2000-12-07 13:07:18 +00:00
Sascha Schumann
dedec6614e
Automatically carry over macro definitions from Apache.
...
We don't take everything, because apxs' CFLAGS also includes
optimization, debugging, et cetera flags.
PR: #7211
2000-12-04 16:05:00 +00:00
Hartmut Holzgraefe
929197cf83
merged ext/apache/CREDITS and sapi/apache/CREDITS
2000-11-22 23:04:33 +00:00
Hartmut Holzgraefe
1f6878e912
2nd step towards auto-credits
2000-11-20 10:33:33 +00:00
Zeev Suraski
030b707296
Update SAPI modules to interface with the new TSRM.
...
Enable thread-safety memory debugging in ISAPI when in debug mode
2000-11-18 02:44:04 +00:00
Zeev Suraski
0f7f5c2c0e
- Import Jade Nicoletti's transparent gzip encoding support as an output
...
handler. Works quite nicely!
- Fix buglets in output buffering
- Add output_handler INI directive
2000-11-13 18:54:37 +00:00
Sascha Schumann
04f180b08a
More verbose error message for non-working apxs case
2000-11-13 12:43:44 +00:00
Zeev Suraski
a023f9280a
- Fix Windows build
...
- Changed the Apache .dsp to expect the Apache source code files under php_build
2000-11-02 14:53:10 +00:00
Zeev Suraski
8c4852c2cb
Fix a nasty bug in the shutdown sequence of PHP under Apache.
2000-11-02 12:05:54 +00:00
Andi Gutmans
0330643ea2
- Revert patch which seems to have caused the STOP mechanism not to work.
...
- I'm not quite sure why this should have caused harm even if not completey
- the right way of doing it.
2000-11-01 11:23:52 +00:00
Zeev Suraski
0ee12a6488
Fix Apache build
2000-10-31 18:28:04 +00:00
Sascha Schumann
27a8480028
Add/unify aborted connection handling
2000-10-29 16:01:02 +00:00
Zeev Suraski
1fd09132c2
Initial steps to move the INI mechanism to the Zend engine
2000-10-29 11:38:26 +00:00
Rasmus Lerdorf
c3026223f7
This appears to be the correct fix to me.
...
@ Fix memory leak in x-httpd-source mode (Jason Greene)
2000-10-14 05:06:16 +00:00
Daniel Beulshausen
c6e0cef254
trivial output change
...
# someone urged me too
2000-10-13 19:08:05 +00:00
Zeev Suraski
ce51b94461
Fix php_value issue
2000-10-13 17:07:09 +00:00
Zeev Suraski
1abd99a443
Fixed a problem that allowed users to override admin_value's and admin_flag's
2000-10-11 16:24:35 +00:00
Andi Gutmans
2622eba31d
- Cleanup some output functions
2000-09-30 16:13:48 +00:00
Sascha Schumann
3be464e4ec
UnixWare defines shutdown to _shutdown, which causes problems later
...
on when using a structure member named shutdown. Since this source
file does not use the system call shutdown, it is safe to #undef it.
PR: #6008 , #6362
2000-09-29 19:08:17 +00:00
Sascha Schumann
cd151feb19
#include "SAPI.h" once
2000-09-26 10:58:56 +00:00
foobar
9559b88894
Fixed bug #6356 .
2000-09-11 13:01:07 +00:00
Jon Parise
9a4c654606
Fix build after last commit.
2000-09-08 15:39:42 +00:00
Zeev Suraski
91c808ecc4
Restore the headers_only test to the centralized SAPI startup. If necessary, it can
...
be overriden in the activate() callback.
2000-09-08 14:43:57 +00:00
Andi Gutmans
9b1aed8323
- Add another ..\ to the TSRM search path
2000-09-08 08:17:17 +00:00
Andi Gutmans
ed8c8539df
- Add TSRM to the apache workspace include path
2000-09-08 08:15:25 +00:00
Sascha Schumann
89a2e1dbdb
Add TSRM include dirs
2000-09-06 15:41:40 +00:00
Andi Gutmans
570e7e9a13
- Defining TSRM_WIN32 in each and every dsp sucked. Revert this change
2000-09-02 16:28:25 +00:00
Andi Gutmans
5bc9f72e85
- More Windows build fixes
2000-09-02 16:02:53 +00:00
Rasmus Lerdorf
8a36eb220e
Missed a couple of center attributes
2000-08-28 09:01:54 +00:00
Daniel Beulshausen
c8eb56cc59
changed the output directorys from the windowsbuilds
2000-08-23 15:43:36 +00:00