edink Mon Nov 18 07:52:57 2002 EDT
Modified files:
/php4/sapi/apache_hooks mod_php4.c php_apache.c php_apache_http.h
Log:
Initial attempt to get apache_hooks api to compile on windows.
Still getting link errors with
undefined symbol: 'php_request_startup_for_hook'.
Index: php4/sapi/apache_hooks/mod_php4.c
diff -u php4/sapi/apache_hooks/mod_php4.c:1.1 php4/sapi/apache_hooks/mod_php4.c:1.2
--- php4/sapi/apache_hooks/mod_php4.c:1.1 Sun Nov 17 20:01:21 2002
+++ php4/sapi/apache_hooks/mod_php4.c Mon Nov 18 07:52:57 2002
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php4.c,v 1.1 2002/11/18 01:01:21 gschlossnagle Exp $ */
+/* $Id: mod_php4.c,v 1.2 2002/11/18 12:52:57 edink Exp $ */
#include "php_apache_http.h"
@@ -1268,6 +1268,7 @@
static int php_uri_translation(request_rec *r)
{
+ TSRMLS_FETCH();
php_per_server_config *conf;
AP(current_hook) = AP_URI_TRANS;
conf = (php_per_server_config *) get_module_config(r->server->module_config,
&php4_module);
@@ -1278,6 +1279,7 @@
static int php_header_hook(request_rec *r)
{
+ TSRMLS_FETCH();
php_per_dir_config *conf;
AP(current_hook) = AP_HEADER_PARSE;
conf = (php_per_dir_config *) get_module_config(r->per_dir_config,
&php4_module);
@@ -1288,6 +1290,7 @@
static int php_auth_hook(request_rec *r)
{
+ TSRMLS_FETCH();
php_per_dir_config *conf;
AP(current_hook) = AP_AUTHENTICATION;
conf = (php_per_dir_config *) get_module_config(r->per_dir_config,
&php4_module);
@@ -1298,6 +1301,7 @@
static int php_access_hook(request_rec *r)
{
+ TSRMLS_FETCH();
php_per_dir_config *conf;
AP(current_hook) = AP_ACCESS_CONTROL;
conf = (php_per_dir_config *) get_module_config(r->per_dir_config,
&php4_module);
@@ -1309,6 +1313,7 @@
static int php_type_hook(request_rec *r)
{
+ TSRMLS_FETCH();
php_per_dir_config *conf;
AP(current_hook) = AP_TYPE_CHECKING;
conf = (php_per_dir_config *) get_module_config(r->per_dir_config,
&php4_module);
@@ -1320,6 +1325,7 @@
static int php_fixup_hook(request_rec *r)
{
+ TSRMLS_FETCH();
php_per_dir_config *conf;
AP(current_hook) = AP_FIXUP;
conf = (php_per_dir_config *) get_module_config(r->per_dir_config,
&php4_module);
@@ -1331,6 +1337,7 @@
static int php_logger_hook(request_rec *r)
{
+ TSRMLS_FETCH();
php_per_dir_config *conf;
AP(current_hook) = AP_LOGGING;
conf = (php_per_dir_config *) get_module_config(r->per_dir_config,
&php4_module);
@@ -1342,6 +1349,7 @@
static int php_post_read_hook(request_rec *r)
{
+ TSRMLS_FETCH();
php_per_dir_config *conf;
php_per_server_config *svr;
AP(current_hook) = AP_POST_READ;
@@ -1357,6 +1365,7 @@
static int php_response_handler(request_rec *r)
{
+ TSRMLS_FETCH();
php_per_dir_config *conf;
AP(current_hook) = AP_RESPONSE;
conf = (php_per_dir_config *) get_module_config(r->per_dir_config,
&php4_module);
Index: php4/sapi/apache_hooks/php_apache.c
diff -u php4/sapi/apache_hooks/php_apache.c:1.3 php4/sapi/apache_hooks/php_apache.c:1.4
--- php4/sapi/apache_hooks/php_apache.c:1.3 Mon Nov 18 01:14:10 2002
+++ php4/sapi/apache_hooks/php_apache.c Mon Nov 18 07:52:57 2002
@@ -17,7 +17,7 @@
| David Sklar <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.c,v 1.3 2002/11/18 06:14:10 rasmus Exp $ */
+/* $Id: php_apache.c,v 1.4 2002/11/18 12:52:57 edink Exp $ */
#include "php_apache_http.h"
@@ -91,16 +91,16 @@
RETURN_FALSE; \
}
#define APREQ_GET_REQUEST(ZVAL, R) APREQ_GET_THIS(ZVAL); \
- R =
get_apache_request(ZVAL)
+ R =
+get_apache_request(ZVAL TSRMLS_CC)
static void php_apache_request_free(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{
zval *z = (zval *)rsrc->ptr;
- fprintf(stderr, "%s() %p\n", __FUNCTION__, z);
+/* fprintf(stderr, "%s() %p\n", __FUNCTION__, z); */
zval_ptr_dtor(&z);
}
-static request_rec *get_apache_request(pval *z)
+static request_rec *get_apache_request(pval *z TSRMLS_DC)
{
request_rec *r;
zval **addr;
@@ -132,7 +132,7 @@
/* {{{ php_apache_request_new(request_rec *r)
* create a new zval-instance for ApacheRequest that wraps request_rec
*/
-PHPAPI zval *php_apache_request_new(request_rec *r)
+zval *php_apache_request_new(request_rec *r TSRMLS_DC)
{
zval *req;
zval *addr;
@@ -1022,8 +1022,6 @@
request_rec *r;
int rec;
- TSRMLS_FETCH();
-
switch(ARG_COUNT(ht)) {
case 0:
rec = 0;
@@ -1049,7 +1047,6 @@
zval *id;
request_rec *r;
- TSRMLS_FETCH();
if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &length) == FAILURE) {
WRONG_PARAM_COUNT;
}
@@ -1086,7 +1083,6 @@
zval **buffer;
zval *id;
request_rec *r;
- TSRMLS_FETCH();
if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &buffer) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -1131,7 +1127,6 @@
request_rec *r;
int facility = APLOG_ERR;
- TSRMLS_FETCH();
switch(ARG_COUNT(ht)) {
case 1:
if(zend_get_parameters_ex(1, &z_errstr) == FAILURE) {
@@ -1166,7 +1161,6 @@
zval *id;
zval **file;
request_rec *r, *sub_r;
- TSRMLS_FETCH();
if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &file) == FAILURE) {
WRONG_PARAM_COUNT;
}
@@ -1189,7 +1183,7 @@
zval *id;
zval **file;
request_rec *r, *sub_r;
- TSRMLS_FETCH();
+
if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &file) == FAILURE) {
WRONG_PARAM_COUNT;
}
@@ -1212,7 +1206,7 @@
zval *id;
zval **file, **method;
request_rec *r, *sub_r;
- TSRMLS_FETCH();
+
if(ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &method, &file) == FAILURE) {
WRONG_PARAM_COUNT;
}
@@ -1237,7 +1231,6 @@
request_rec *r;
int status;
- TSRMLS_FETCH();
APREQ_GET_REQUEST(id, r);
if(!r || ap_is_initial_req(r))
RETURN_FALSE;
@@ -1252,7 +1245,7 @@
zval *id;
zval **new_uri;
request_rec *r;
- TSRMLS_FETCH();
+
if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &new_uri) == FAILURE) {
WRONG_PARAM_COUNT;
}
@@ -1268,7 +1261,6 @@
zval *id;
request_rec *r;
- TSRMLS_FETCH();
if(ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &fieldname, &fieldval) ==
FAILURE) {
WRONG_PARAM_COUNT;
}
Index: php4/sapi/apache_hooks/php_apache_http.h
diff -u php4/sapi/apache_hooks/php_apache_http.h:1.1
php4/sapi/apache_hooks/php_apache_http.h:1.2
--- php4/sapi/apache_hooks/php_apache_http.h:1.1 Sun Nov 17 20:01:21 2002
+++ php4/sapi/apache_hooks/php_apache_http.h Mon Nov 18 07:52:57 2002
@@ -39,5 +39,6 @@
#include "mod_php4.h"
-PHPAPI zval *php_apache_request_new(request_rec *r);
+zval *php_apache_request_new(request_rec *r);
+int apache_php_module_hook(request_rec *r, php_handler *handler, zval **ret
+TSRMLS_DC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
