Commit Graph

450 Commits

Author SHA1 Message Date
foobar
1aa5bab89c Nuke warning 2003-09-09 21:38:31 +00:00
foobar
0c0d3a41d1 fix typo 2003-09-09 21:34:12 +00:00
foobar
f04643ee4c Show the runtime version of Apache instead of compile time. 2003-09-09 21:30:48 +00:00
Ilia Alshanetsky
21d5061038 Fixed format bug 2003-08-28 17:48:58 +00:00
foobar
3a7ca909be - HAVE_OPENSSL_EXT is not defined always. 2003-06-27 16:41:41 +00:00
Edin Kadribasic
f58cc5d28a Fixed win32 build (mod_php4 -> mod_php5) 2003-06-15 11:36:02 +00:00
James Cox
f68c7ff249 updating license information in the headers. 2003-06-10 20:04:29 +00:00
Rasmus Lerdorf
a516171dec MFB - fix a couple of missing closing folding tags 2003-06-03 05:44:17 +00:00
foobar
dcb0daeae3 - Fix the error message if apxs|2 is fubar. 2003-05-28 14:11:21 +00:00
Moriyoshi Koizumi
f3b050fba1 Fixed a syntax highlighter problem that happens when output buffering is turned
on
2003-05-16 23:08:23 +00:00
Edin Kadribasic
d758f2ea0b Reverting my last patch because user reports it does not help
solve the problem. (bug #23504)
2003-05-09 09:11:14 +00:00
Edin Kadribasic
97f3a35d73 Fixed MFB side effect 2003-05-08 14:42:31 +00:00
Edin Kadribasic
6f0e0a61b6 MFB 2003-05-08 09:27:18 +00:00
Sascha Schumann
d26e1b751c Merge proper -I parameter for APXS builds 2003-03-30 18:36:04 +00:00
Sterling Hughes
3f700e58ab update php module name to php5, not php4.
apache, apache2* and cli/cgi work.
sapi module maintainers should fix up their sapis, as I don't run
any servers with php outside of apache.
2003-03-29 04:52:46 +00:00
Sebastian Bergmann
5ca078779a Eliminate some TSRMLS_FETCH() calls. Tested with Win32 build of SAPI/CGI and SAPI/CLI on Win32. 2003-03-25 08:07:13 +00:00
Stig Bakken
0e6fca4f22 * email address change 2003-03-18 12:06:09 +00:00
foobar
3c9155e0cb Renamed OnUpdateInt -> OnUpdateLong to prevent further misunderstandings.
# Intentionally left out any 'alias' for it, this way 3rd party extension
# maintainers will really NOTICE the change.
2003-03-07 05:15:28 +00:00
foobar
73bae37f26 Possible fix for #22259 + part 1/2 for fixing one AIX bug.. 2003-02-24 16:16:11 +00:00
George Schlossnagle
e49bc59a79 ws fix 2003-02-24 01:25:30 +00:00
George Schlossnagle
f5fb75f390 hopefully a fix for 19919 2003-02-24 01:19:08 +00:00
foobar
58e4503942 Added missing headers and $Id$ tags. 2003-02-23 09:50:43 +00:00
foobar
6000c7b46c - Fixed bug #22376 (wrong httpd.conf modified when using INSTALL_ROOT) 2003-02-23 07:32:03 +00:00
David Viner
1cf1e31acc this tiny change adds the location of apache includes and libraries that
are installed when you use the Apache Windows Installer
(C:\Program Files\Apache Group\Apache\*).  With this patch,
a windows developer who has used the Apache Windows Installer should be
able to compile the Apache sapi module without any modifications to his/her
installed tree.  It should have no effect whatsoever on anyone else.

--dviner
2003-02-21 00:14:33 +00:00
Zeev Suraski
4934744b93 Win32 build improvements 2003-02-17 13:29:59 +00:00
foobar
2f2f6739b4 Added HAVE_APACHE define. 2003-02-13 07:47:21 +00:00
foobar
e337c5d1c6 Fixed the "member fd in BUFF" test for --with-apxs builds 2003-02-12 17:09:31 +00:00
Sascha Schumann
fa6d2d48c5 move check to proper place 2003-02-11 02:34:52 +00:00
Sascha Schumann
67f18fcf6c Detect whether BUFFs contain a fd element. IBM is hiding the actual
descriptor behind a void *, so we just disable this for IBM servers
2003-02-11 02:23:29 +00:00
Sascha Schumann
ba32a619ae use SUCCESS/FAILURE instead of 0/-1 2003-02-09 21:15:55 +00:00
Ilia Alshanetsky
acc9c13c36 Build Fix. 2003-02-05 00:41:40 +00:00
Ilia Alshanetsky
13f8b211c4 Fixed compilation of Apache & Apache Hooks SAPIs. 2003-02-04 20:54:17 +00:00
Zeev Suraski
3a1a209baf Updates reflecting infrastructure changes 2003-02-04 13:12:48 +00:00
Ilia Alshanetsky
8a9e09a44a ARG_COUNT(ht) -> ZEND_NUM_ARGS(). 2003-01-21 14:56:40 +00:00
Sascha Schumann
294e776d95 add sapi_get_target_uid/_gid for obtaining information about the
non-privileged user the web server is running as.  this is useful
for creating shared memory segments which need to be accessed by
the child processes/threads.
2003-01-21 11:03:58 +00:00
Ilia Alshanetsky
c794f2c710 Removed pointless memory allocation checks. 2003-01-18 20:27:05 +00:00
Zeev Suraski
a2b58500b4 Make the .dsp use the php4build build directories 2003-01-05 15:09:11 +00:00
Derick Rethans
c175f3545c - Fix docrefs 2003-01-03 21:33:31 +00:00
Derick Rethans
0127c07e45 - Fix typo (patch by Joseph Tate) 2003-01-03 21:30:49 +00:00
Anantha Kesari H Y
38a319e3c6 New file added for NetWare. 2003-01-03 15:39:43 +00:00
Zeev Suraski
895b5fc2b6 Fix .dsp 2003-01-02 14:19:29 +00:00
Sebastian Bergmann
2c5d4b8c23 Bump year. 2002-12-31 15:59:15 +00:00
Ilia Alshanetsky
097055a862 Make the version code get the version from the current Apache, rather then
the Apache PHP was compiled against.
2002-12-27 23:05:15 +00:00
Ilia Alshanetsky
648dd88b42 Added apache_get_version() & apache_get_modules() to Apache 1.X & Apache
Hooks sapis.
Made the module listing in Apache 2 not show the '.c' portion, to be
consistent with Apache 1.X.
2002-12-27 22:47:06 +00:00
Andrei Zmievski
2feb1cf6d7 MFB. 2002-12-21 20:12:08 +00:00
foobar
8635af07d5 Fixed bug #20298: LDFLAGS were not passed to the static apache module build 2002-12-11 08:41:45 +00:00
Marcus Boerger
ae35c4731f php_error -> php_error_docref 2002-12-05 23:18:28 +00:00
Sascha Schumann
2b95b3c83b add a "force HTTP/1.0 response" facility to the SAPI layer
this is necessary, when you want to take over control of a connection
and the web server is doing stupid things by default (like enabling
chunked transfer encoding for no reason).
2002-12-01 03:28:21 +00:00
Sascha Schumann
09f463ddae Add sapi_get_fd() and implement it for the Apache/thttpd SAPIs. 2002-11-26 05:15:55 +00:00
Ilia Alshanetsky
b09c1afe0e PHP flags specified in .htaccess can now be turned on by using '1' as well as
'On'.
2002-11-10 19:34:09 +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
Hartmut Holzgraefe
c4cb92229c this will be handled elsewhere 2002-10-21 20:20:08 +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
Colin Viebrock
c7c275b741 fix phpinfo() output for better browser BC 2002-09-26 17:54:54 +00:00
Ilia Alshanetsky
fd094b5b1e Fixed bug #15038, original patch by: phpman@toowards.com 2002-09-21 15:42:33 +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
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
Rasmus Lerdorf
f5630aa246 Fix xbithack bug finally (see bug #16515) 2002-08-19 15:52:21 +00:00
Stefan Esser
8d2bc70752 make POST requests work again 2002-08-18 13:05:44 +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
Rasmus Lerdorf
cd9bb8e555 Fix proto 2002-08-13 04:03:20 +00:00
foobar
272913f3d4 - Fixed bug: #18560, the macro was not defined always. 2002-07-25 18:37:16 +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
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