[PHP-CVS] cvs: php4(PHP_4_3) /sapi/apache mod_php4.c
rasmus Tue Jun 3 01:41:49 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/sapi/apache mod_php4.c
Log:
Fix a couple of closing folding tags
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.146.2.11 php4/sapi/apache/mod_php4.c:1.146.2.12
--- php4/sapi/apache/mod_php4.c:1.146.2.11 Fri May 30 21:37:44 2003
+++ php4/sapi/apache/mod_php4.c Tue Jun 3 01:41:49 2003
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: mod_php4.c,v 1.146.2.11 2003/05/31 01:37:44 sniper Exp $ */
+/* $Id: mod_php4.c,v 1.146.2.12 2003/06/03 05:41:49 rasmus Exp $ */
#include php_apache_http.h
#include http_conf_globals.h
@@ -380,6 +380,7 @@
return SUCCESS;
}
+/* }}} */
/* {{{ sapi_apache_get_target_uid
*/
@@ -388,6 +389,7 @@
*obj = ap_user_id;
return SUCCESS;
}
+/* }}} */
/* {{{ sapi_apache_get_target_gid
*/
@@ -396,6 +398,7 @@
*obj = ap_group_id;
return SUCCESS;
}
+/* }}} */
/* {{{ sapi_module_struct apache_sapi_module
*/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /sapi/apache mod_php4.c
gschlossnagle Sun Feb 23 20:29:54 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/sapi/apache mod_php4.c
Log:
MFH fix for 19919
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.146.2.5 php4/sapi/apache/mod_php4.c:1.146.2.6
--- php4/sapi/apache/mod_php4.c:1.146.2.5 Mon Feb 10 21:25:48 2003
+++ php4/sapi/apache/mod_php4.c Sun Feb 23 20:29:54 2003
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: mod_php4.c,v 1.146.2.5 2003/02/11 02:25:48 sas Exp $ */
+/* $Id: mod_php4.c,v 1.146.2.6 2003/02/24 01:29:54 gschlossnagle Exp $ */
#include php_apache_http.h
#include http_conf_globals.h
@@ -170,6 +170,10 @@
char *header_name, *header_content, *p;
request_rec *r = (request_rec *) SG(server_context);
+ if(!r) {
+ efree(sapi_header-header);
+ return 0;
+ }
header_name = sapi_header-header;
header_content = p = strchr(header_name, ':');
@@ -293,11 +297,14 @@
TSRMLS_FETCH();
php_output_set_status(0 TSRMLS_CC);
- SG(server_context) = NULL; /* The server context (request) is invalid by the
time run_cleanups() is called */
if (AP(in_request)) {
AP(in_request) = 0;
php_request_shutdown(dummy);
}
+ SG(server_context) = NULL;
+ /* The server context (request) is NOT invalid by the time
+* run_cleanups() is called
+*/
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /sapi/apache mod_php4.c
sas Wed Jan 15 06:29:05 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/sapi/apache mod_php4.c
Log:
MFH 1.150
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.146.2.2 php4/sapi/apache/mod_php4.c:1.146.2.3
--- php4/sapi/apache/mod_php4.c:1.146.2.2 Tue Dec 31 11:26:54 2002
+++ php4/sapi/apache/mod_php4.c Wed Jan 15 06:29:05 2003
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: mod_php4.c,v 1.146.2.2 2002/12/31 16:26:54 sebastian Exp $ */
+/* $Id: mod_php4.c,v 1.146.2.3 2003/01/15 11:29:05 sas Exp $ */
#include php_apache_http.h
@@ -343,6 +343,34 @@
}
/* }}} */
+/* {{{ sapi_apache_get_fd
+ */
+static int sapi_apache_get_fd(int *nfd TSRMLS_DC)
+{
+ request_rec *r = SG(server_context);
+ int fd;
+
+ fd = r-connection-client-fd;
+
+ if (fd = 0) {
+ if (nfd) *nfd = fd;
+ return 0;
+ }
+ return -1;
+}
+/* }}} */
+
+/* {{{ sapi_apache_force_http_10
+ */
+static int sapi_apache_force_http_10(TSRMLS_D)
+{
+ request_rec *r = SG(server_context);
+
+ r-proto_num = HTTP_VERSION(1,0);
+
+ return 0;
+}
+
/* {{{ sapi_module_struct apache_sapi_module
*/
static sapi_module_struct apache_sapi_module = {
@@ -382,7 +410,12 @@
unblock_alarms, /* Unblock interruptions */
#endif
- STANDARD_SAPI_MODULE_PROPERTIES
+ NULL, /* default post reader
+*/
+ NULL, /* treat data */
+ NULL, /* exe location */
+ 0, /* ini ignore
+*/
+ sapi_apache_get_fd,
+ sapi_apache_force_http_10
};
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /sapi/apache mod_php4.c
andrei Sat Dec 21 15:09:09 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/sapi/apache mod_php4.c
Log:
Make PHP_AUTH_* variables not available in safe mode under Apache. Patch by
Philip Olson.
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.146 php4/sapi/apache/mod_php4.c:1.146.2.1
--- php4/sapi/apache/mod_php4.c:1.146 Sun Nov 10 14:34:09 2002
+++ php4/sapi/apache/mod_php4.c Sat Dec 21 15:09:09 2002
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: mod_php4.c,v 1.146 2002/11/10 19:34:09 iliaa Exp $ */
+/* $Id: mod_php4.c,v 1.146.2.1 2002/12/21 20:09:09 andrei Exp $ */
#include php_apache_http.h
@@ -415,7 +415,7 @@
authorization = table_get(r-headers_in, Authorization);
}
if (authorization
-!auth_type(r)
+(!PG(safe_mode) || (PG(safe_mode) !auth_type(r)))
!strcasecmp(getword(r-pool, authorization, ' '), Basic)) {
tmp = uudecode(r-pool, authorization);
SG(request_info).auth_user = getword_nulls_nc(r-pool, tmp, ':');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
