clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-20 07:53:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,155 Commits 496 Branches 1,370 Tags 810 MiB
c0e9579204
Commit Graph

249 Commits

Author SHA1 Message Date
Ilia Alshanetsky
2f15b2062c Fixed bug #23759 (PHP doesn't preserve subrequest status). 
(jaboydjr.netwalk@com, Ilia)
 2003-05-23 02:41:59 +00:00
Moriyoshi Koizumi
af32730476 Revert the last patch. 
# sorry for the annoyance
 2003-05-14 18:15:01 +00:00
Moriyoshi Koizumi
0d39841728 Oops 2003-05-13 19:35:49 +00:00
Moriyoshi Koizumi
e54919d230 Fixed bug #23610 2003-05-13 19:33:36 +00:00
Ilia Alshanetsky
11d9dd93b9 Fixed bug #23417 (compile failure in apache2filter sapi). 2003-04-30 00:47:08 +00:00
Sascha Schumann
ca47774ede MFB usage fix 2003-04-28 19:43:09 +00:00
Ilia Alshanetsky
f7d72d178d Fixed bug #23232 (safe_mode does not honor PHP_AUTH_* in apache2) 2003-04-16 23:31:23 +00:00
Stanislav Malyshev
2849872f19 make Apache define SG(request_info).path_translted, like Apache 1 did. 2003-04-10 11:28:54 +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
Edin Kadribasic
14a56343c8 MFB: Disable building of apache2filter (obsoleted by handler). 2003-03-25 10:40:39 +00:00
foobar
96c02a1251 - This is not supposed to be 'pretty' name. (ref. bug #22853) 2003-03-25 01:38:14 +00:00
foobar
f10d00b374 - Changed --with-apxs2 for apache2handler. 
# Can we nuke that apache2filter now from php5 ?
 2003-03-10 03:14:37 +00:00
foobar
45964cb629 - Fix for some unixware compile problem. (comment by Sascha :) 2003-03-05 16:12:23 +00:00
Edin Kadribasic
d1feae01d9 Credits update. 2003-03-04 00:10:11 +00:00
Zeev Suraski
80d0fa7aad (possibly) fix Win32 builds of the Apache 2 filter 2003-02-24 15:10:36 +00:00
foobar
6000c7b46c - Fixed bug #22376 (wrong httpd.conf modified when using INSTALL_ROOT) 2003-02-23 07:32:03 +00:00
foobar
35f3f3ecc6 These both are experimental still. (there has been a note in config.m4 
all the time but these marker files were missing)
 2003-02-23 02:39:51 +00:00
Moriyoshi Koizumi
59be236a8e Removed unnecessary code 2003-02-10 19:12:02 +00:00
foobar
591c485045 Fix bug: #22035 (EXTRA_LDFLAGS for AIX not correct) 2003-02-03 17:35:10 +00:00
Ilia Alshanetsky
835e6481e4 Fixed bug #17868 (more then the <!--include--> directive used to include 
a PHP file would result in a crash).
 2003-01-28 16:34:21 +00:00
Ilia Alshanetsky
d92a1f4dc1 Fixed win32 build (bug #21506). 
Fixed a bug that would cause garbage data to appear at the end of the
loaded apache modules list in phpinfo().
 2003-01-28 01:25:34 +00:00
foobar
961c9856ef Fixed bug: #21698, httpd.conf not modified with "make install" 2003-01-21 06:02:19 +00:00
Ilia Alshanetsky
c794f2c710 Removed pointless memory allocation checks. 2003-01-18 20:27:05 +00:00
Moriyoshi Koizumi
dd9b7f25cf This patch is likely to fix win32 build 2003-01-11 22:36:38 +00:00
Anantha Kesari H Y
c1498d7a15 Modifications for NetWare. 2003-01-03 15:59:02 +00:00
Sebastian Bergmann
2c5d4b8c23 Bump year. 2002-12-31 15:59:15 +00:00
Ilia Alshanetsky
87e598e835 Changed ifdef to if. 2002-12-31 00:10:57 +00:00
Ilia Alshanetsky
6f6bc82de7 Fixed bug #21045 (Apache 2 SAPI now supports the mod_php_memory_usage 
log variable that allows users to log the memory usage of their PHP scripts).
 2002-12-30 23:45:18 +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
Ilia Alshanetsky
572394db74 Added MINFO() to Apache 2, which displays the Apache version & all of the 
loaded Apache modules.
Added apache_get_version() & apache_get_modules() functions.
 2002-12-27 22:02:17 +00:00
Ilia Alshanetsky
967d64ade5 Fixed bug #17098 (make Apache aware that PHP scripts represent dynamic data 
and should not be cached). Fix suggested by daniel.eckl@gmx.de.
 2002-12-27 19:59:09 +00:00
Moriyoshi Koizumi
9dc6f0c5f2 Made auth information inaccessible under safe mode as discussed in the list 2002-12-21 21:50:28 +00:00
Moriyoshi Koizumi
4456b3274f WS 2002-12-21 06:34:31 +00:00
Moriyoshi Koizumi
f4883b916c Added some notes about the brigade bug detection 2002-12-21 06:33:19 +00:00
Moriyoshi Koizumi
978340cfa5 An intuitive attempt to hunt the bug. 2002-12-18 19:32:44 +00:00
Ilia Alshanetsky
04a16f914c Replaced deprecated APR_BRIGADE_FOREACH macro. 2002-12-09 18:45:32 +00:00
foobar
dd53efc196 - Made the STANDARD_SAPI_MODULE_PROPERTIES be what it says it is. 2002-11-26 05:57:06 +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
3f7081c439 Fix debugging description 2002-11-04 13:22:23 +00:00
Ilia Alshanetsky
4886072b4b Fixed bug #20217. When php_flag & php_value are used, the PHP_INI_PERDIR 
flag should be used when setting the ini value. Otherwise, the user cannot
modify per-directory ini settings specified via .htaccess.
 2002-11-02 23:08:20 +00:00
James Cox
a63d607f08 adding id tags 2002-11-02 16:04:27 +00:00
Sascha Schumann
b39ca47d20 syntax highlighting has been added 2002-11-02 13:47:27 +00:00
Sascha Schumann
68bb574637 add missing }}} closure 2002-11-02 04:53:31 +00:00
Sascha Schumann
ac4d1a1927 fix obvious copy&paste error 2002-11-02 04:35:25 +00:00
Sascha Schumann
d554b8d3ab Maintain appropiate line breaks 2002-10-23 10:11:38 +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
Ilia Alshanetsky
8361687a4a Fixed a bug with .phps handler. 2002-10-16 20:45:36 +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
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
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
Ilia Alshanetsky
8a1556b3a1 Fixed bug #17662 2002-09-23 04:10:25 +00:00
Zeev Suraski
b23adfb43b Fix double initialization 2002-09-21 01:53:15 +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
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
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
foobar
999d9aa10f Better fix it here too.. 2002-06-29 00:33:02 +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
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
Stefan Esser
44a5b43b79 Fixing the same possible memory leak. 2002-06-21 14:47:59 +00:00
Sascha Schumann
5e148e3875 too many flushes are bad 2002-06-08 18:11:03 +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
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
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
Sebastian Bergmann
5192f6432c Patch by Justin Erenkrantz <jerenkrantz@apache.org>. This should be MFHed. 2002-05-11 08:58:20 +00:00
Derick Rethans
dedf22f5ad - Added Aaron Bannert as maintainer 2002-05-08 05:17:59 +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
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
12ba44827a be a bit more verbose about what is wrong 2002-04-26 21:26:47 +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
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
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
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
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