1
0
mirror of https://github.com/php/php-src.git synced 2026-03-25 00:32:23 +01:00
Commit Graph

735 Commits

Author SHA1 Message Date
George Schlossnagle
ef4573eaf2 white space changes (s/ /\t/g) 2002-10-23 07:12:13 +00:00
George Schlossnagle
c382dbbac6 fixed directory merging 2002-10-23 06:07:07 +00:00
George Schlossnagle
d9647606fb fixed return values for php_response_handler 2002-10-09 02:57:33 +00:00
George Schlossnagle
7adb8e0ba9 header code cleanup 2002-10-08 06:25:02 +00:00
George Schlossnagle
b85162590d sync with head. add optional content type param to send_http_header 2002-10-08 02:17:02 +00:00
George Schlossnagle
2306fe934d Cleaned up a bunch of code, fully integrated the class::method handler
code into a single stack per handlers (for correct interleaving).

Changed the syntax so that now they are of the form

phpUriHandler /filename
phpUriHandlerMethod Class::Method

This now works for all handlers including response handlers.
2002-08-30 19:12:28 +00:00
George Schlossnagle
b0e2b8604f added the ability to set handlers as class methods (classes will need to be
declared in a phpRequire statemenet, of course, or be otherwise available
at the hook run-time (builtins)).  This is currently only implemented
for the uri trans handler  it is usable as:

phpUriHandlerCodeRef MyClass::MyMethod

This can be greatly robustified from whre it stands now, but is a good proof
of concept (hopefully!)
2002-08-29 20:23:07 +00:00
George Schlossnagle
d44619a811 added all the sub_request methods and logging methods 2002-08-28 21:23:12 +00:00
George Schlossnagle
2bc1d055cb Added wrapper functions for the majority of the apache API_EXPORT functions
as class methods for the ApacheRequest objects.  broke sapi_activate
into two functions to allow for reading of headers/cookies separately
from request bodies (POST stuff).  Altered some of the send_headers code
in mod_php4.c to prevent sending headers twice (since a phpResponseHandler
needs to be able to have full freedom for setting headers using the
ap_*_header* functions.
2002-08-28 18:56:51 +00:00
George Schlossnagle
0a105b4130 added wrapper for ap_send_http_header so that phpResponseHandler is now
working.  Added protections to mod_php4's internal call to the same so
that headers cannot be accidentally sent twice.
2002-08-28 04:37:37 +00:00
George Schlossnagle
22528c9e59 This handler works much better when not commented out. :) 2002-08-28 03:55:42 +00:00
George Schlossnagle
4030dc1224 All handlers are now 'stacked' allowing for multiple handlers to be called in the
order they are listed in the httpd.conf for a section.  phpRequire is now supported (called out of the post-read request handler), and a first attempt at phpResponseHandler, a response-time type handler which is set by a

<Location blah>
SetHandler php-script
phpResponseHandler /tmp/foo.php
</Location>

To allow for the stacked handlers, the entirety of zend_stack.c was imported into mod_php4.c.  There is a patch pending to zend_stack.c to add the functionality so that all the redundant code can be removed.
2002-08-27 20:57:09 +00:00
George Schlossnagle
b185cac59d Replaced handler loading commands such that what was
php_value uri_handler /tmp/foo.php

is now

phpUriHandler	/tmp/foo.php

This fixes some bugs that caused handlers to be skipped or mysteriously 'unloaded',
reduces the number of calls to zend_alter_ini_entries that are necessary, as well
as allows for easier implementation of stacked handlers (which comes next).

Added 2 new hooks, phpPostReadHandler and phpHeaderHandler (going to the obvious places).
2002-08-27 14:41:53 +00:00
lukas schroeder
dc0ad431c8 - add interface functions for headers_in, headers_out and err_headers_out 2002-08-26 23:49:15 +00:00
George Schlossnagle
f05126e2cf Import of Lukas Schroeder's work to give php a full interface to apache 1.3.x's hook interface, and full class wrappers around the apache request object and it's interfaces. 2002-08-26 20:06:31 +00:00
SVN Migration
025580f68a This commit was manufactured by cvs2svn to create branch 'apache_hooks'. 2002-08-22 07:56:40 +00:00
Rasmus Lerdorf
15611c1885 Ok, get it onto the right branch
(cvs can get annoying sometimes)
2001-09-06 23:39:02 +00:00
Rasmus Lerdorf
2797cf1323 Apache request handler hook framework. So far only the uri hook is
implemented, but the others will be easy once I finish the uri translation
example.  The big things left to do is to create a proper $r request
object to be manipulated in user-space and also to verify that the hooks
don't steal the POST data such that it isn't available to the content
handler once it is finally called.  Or if we do steal it, make sure it
is somehow available to the content handler later on.

Comments and help with this stuff is more than welcome.  Check out these
files from the 'apache_hooks' branch to play along.
2001-09-06 09:53:34 +00:00
SVN Migration
22f9e24408 This commit was manufactured by cvs2svn to create branch 'apache_hooks'. 2001-08-31 22:03:25 +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
Doug MacEachern
23f1b515a6 add php version component 2001-08-28 06:23:27 +00:00
Doug MacEachern
c614a9ed3d not all MPMs support child_init,
so move php_apache_server_startup to the post_config phase
(happens at server startup)
2001-08-28 06:19:58 +00:00
Sterling Hughes
766de15694 Add some editor modes (in the rest of the source) 2001-08-22 04:45:51 +00:00
Zeev Suraski
e140b35b04 API update 2001-08-21 12:57:53 +00:00
Doug MacEachern
9b137805c8 automatically add php input/output filters when give the standard 1.x config:
AddType application/x-httpd-php .php
with that, no longer need "Set{In,Out}putFilter PHP" configuration for 2.0
2001-08-20 16:34:45 +00:00
Shane Caraveo
108633e1ab Windows compilation of fast cgi now working. See windows.txt for info. 2001-08-20 05:00:05 +00:00
Doug MacEachern
4829b93fb2 php_input_filter needs to ignore proxy requests
else it swallows POST data that needs to be sent to the downstream server
2001-08-19 21:07:50 +00:00
Sterling Hughes
ba4a1f2df2 Pass on proxy requests (fix by Doug MacEachern <dougm@covalent.net>) 2001-08-19 20:28:36 +00:00
Sterling Hughes
244c9ff3c9 Fix warning (Doug MacEachern, dougm@covalent.net) 2001-08-18 01:59:38 +00:00
Sterling Hughes
353f84c190 # f*ck @!e333u49/&§&$T§$&("E""! expandtab, that's it, the default in my
# vimrc is not noet
2001-08-18 01:36:29 +00:00
Sterling Hughes
0e12954669 fix crash bug (Doug MacEachern, dougm@covalent.net) 2001-08-18 01:34:19 +00:00
Ryan Bloom
1543904d71 Fix a seg fault in PHP. If a child process is created in the server,
using apr_proc_create, it will seg fault, because PHP is using a NULL
child cleanup.  To fix this, we have to use the special cleanup function,
apr_pool_cleanup_null.

This also fixes a compiler warning in the ap_log_error call.
2001-08-17 22:25:13 +00:00
Sterling Hughes
fe7b5a3434 darn noet 2001-08-16 06:09:12 +00:00
Sterling Hughes
b87834a12d Ryan Bloom's fix of my fix. ;) 2001-08-16 06:05:57 +00:00
Sterling Hughes
9395f0e6e2 Fix error logging 2001-08-16 05:19:29 +00:00
Zeev Suraski
8021e65569 Revert an old bogus patch 2001-08-14 23:17:02 +00:00
Daniel Beulshausen
388dfa0483 TSRMLS fixes 2001-08-14 17:31:00 +00:00
Daniel Beulshausen
21cac086e4 TSRMLS fixes 2001-08-14 17:16:19 +00:00
Daniel Beulshausen
ba761ce9b1 TSRMLS fixes 2001-08-14 17:05:53 +00:00
Sascha Schumann
0ccda62835 use an absolute path for symlinking the php library archive 2001-08-14 09:37:25 +00:00
Thies C. Arntzen
e8e401bc2d ypo;-) 2001-08-14 08:33:21 +00:00
Sascha Schumann
98304ba6a0 Use a symlink instead of copying the +6MB library archive during install 2001-08-13 22:34:25 +00:00
Sascha Schumann
96aa97f8b4 Don't display egrep result 2001-08-13 22:17:18 +00:00
Sascha Schumann
f42acb0cd6 whoops, forgot to apply cgi/poll patch before diff'ing 2001-08-13 22:01:55 +00:00
Sascha Schumann
7efc4d8b54 Add check for thttpd-2.21b. We support nothing else for now, because
this version is rock-stable using the combined set of patches.
2001-08-13 21:57:31 +00:00
Sascha Schumann
75c22e9a4a improved thttpd-2.21b patch.. I got tired of applying my patches for
these bugs.

fixes poll(2) issue
fixes hanging cgi issue
fixes off-by-one in scanning input buffers in case of EAGAIN/EWOULDBLOCK
fixes potential bug in managing write buffers
add "index.php" to default files to look for
2001-08-13 21:55:21 +00:00
Zeev Suraski
1e125df0d1 Reverse patches that slipped in by mistake in a whitespace patch. They
require some more work...
2001-08-13 00:36:16 +00:00
Zeev Suraski
f6f6c4d7e6 Whitespace 2001-08-11 16:39:07 +00:00
foobar
18c893d0df killed compile warnings. 2001-08-10 08:36:21 +00:00