sniper Mon Dec 5 20:14:02 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/sapi/apache php_apache.c
/php-src/sapi/apache_hooks php_apache.c
/php-src/sapi/nsapi nsapi.c
/php-src/sapi/roxen roxen.c
Log:
MFH: nuke php3 legacy
http://cvs.php.net/diff.php/php-src/sapi/apache/php_apache.c?r1=1.89&r2=1.89.2.1&ty=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.89
php-src/sapi/apache/php_apache.c:1.89.2.1
--- php-src/sapi/apache/php_apache.c:1.89 Wed Aug 3 10:08:45 2005
+++ php-src/sapi/apache/php_apache.c Mon Dec 5 20:14:01 2005
@@ -17,7 +17,7 @@
| David Sklar <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.c,v 1.89 2005/08/03 14:08:45 sniper Exp $ */
+/* $Id: php_apache.c,v 1.89.2.1 2005/12/06 01:14:01 sniper Exp $ */
#include "php_apache_http.h"
@@ -135,7 +135,7 @@
Get and set Apache request notes */
PHP_FUNCTION(apache_note)
{
- pval **arg_name, **arg_val;
+ zval **arg_name, **arg_val;
char *note_val;
int arg_count = ZEND_NUM_ARGS();
@@ -304,7 +304,7 @@
*/
PHP_FUNCTION(virtual)
{
- pval **filename;
+ zval **filename;
request_rec *rr = NULL;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) ==
FAILURE) {
@@ -411,7 +411,7 @@
Perform a partial request of the given URI to obtain information about it */
PHP_FUNCTION(apache_lookup_uri)
{
- pval **filename;
+ zval **filename;
request_rec *rr=NULL;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) ==
FAILURE) {
@@ -485,7 +485,7 @@
PHP_FUNCTION(apache_exec_uri)
{
- pval **filename;
+ zval **filename;
request_rec *rr=NULL;
TSRMLS_FETCH();
http://cvs.php.net/diff.php/php-src/sapi/apache_hooks/php_apache.c?r1=1.19&r2=1.19.2.1&ty=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.19
php-src/sapi/apache_hooks/php_apache.c:1.19.2.1
--- php-src/sapi/apache_hooks/php_apache.c:1.19 Wed Aug 3 10:08:49 2005
+++ php-src/sapi/apache_hooks/php_apache.c Mon Dec 5 20:14:01 2005
@@ -17,7 +17,7 @@
| David Sklar <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.c,v 1.19 2005/08/03 14:08:49 sniper Exp $ */
+/* $Id: php_apache.c,v 1.19.2.1 2005/12/06 01:14:01 sniper Exp $ */
#include "php_apache_http.h"
@@ -105,7 +105,7 @@
zval_ptr_dtor(&z);
}
-static request_rec *get_apache_request(pval *z TSRMLS_DC)
+static request_rec *get_apache_request(zval *z TSRMLS_DC)
{
request_rec *r;
zval **addr;
@@ -1711,7 +1711,7 @@
*/
PHP_FUNCTION(virtual)
{
- pval **filename;
+ zval **filename;
request_rec *rr = NULL;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) ==
FAILURE) {
@@ -1818,7 +1818,7 @@
Perform a partial request of the given URI to obtain information about it */
PHP_FUNCTION(apache_lookup_uri)
{
- pval **filename;
+ zval **filename;
request_rec *rr=NULL;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) ==
FAILURE) {
@@ -1892,7 +1892,7 @@
PHP_FUNCTION(apache_exec_uri)
{
- pval **filename;
+ zval **filename;
request_rec *rr=NULL;
TSRMLS_FETCH();
http://cvs.php.net/diff.php/php-src/sapi/nsapi/nsapi.c?r1=1.69&r2=1.69.2.1&ty=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69 php-src/sapi/nsapi/nsapi.c:1.69.2.1
--- php-src/sapi/nsapi/nsapi.c:1.69 Wed Aug 3 10:08:50 2005
+++ php-src/sapi/nsapi/nsapi.c Mon Dec 5 20:14:01 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: nsapi.c,v 1.69 2005/08/03 14:08:50 sniper Exp $ */
+/* $Id: nsapi.c,v 1.69.2.1 2005/12/06 01:14:01 sniper Exp $ */
/*
* PHP includes
@@ -310,7 +310,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, "NSAPI Module Revision", "$Revision: 1.69
$");
+ php_info_print_table_row(2, "NSAPI Module Revision", "$Revision:
1.69.2.1 $");
php_info_print_table_row(2, "Server Software", system_version());
php_info_print_table_row(2, "Sub-requests with nsapi_virtual()",
(nsapi_servact_service)?((zend_ini_long("zlib.output_compression",
sizeof("zlib.output_compression"), 0))?"not supported with
zlib.output_compression":"enabled"):"not supported on this platform" );
@@ -329,7 +329,7 @@
*/
PHP_FUNCTION(nsapi_virtual)
{
- pval **uri;
+ zval **uri;
int rv;
char *value;
Request *rq;
http://cvs.php.net/diff.php/php-src/sapi/roxen/roxen.c?r1=1.61&r2=1.61.2.1&ty=u
Index: php-src/sapi/roxen/roxen.c
diff -u php-src/sapi/roxen/roxen.c:1.61 php-src/sapi/roxen/roxen.c:1.61.2.1
--- php-src/sapi/roxen/roxen.c:1.61 Wed Aug 3 10:08:52 2005
+++ php-src/sapi/roxen/roxen.c Mon Dec 5 20:14:02 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: roxen.c,v 1.61 2005/08/03 14:08:52 sniper Exp $ */
+/* $Id: roxen.c,v 1.61.2.1 2005/12/06 01:14:02 sniper Exp $ */
#include "php.h"
#ifdef HAVE_ROXEN
@@ -438,7 +438,7 @@
{
/* char buf[512]; */
php_info_print_table_start();
- php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.61
2005/08/03 14:08:52 sniper Exp $");
+ php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.61.2.1
2005/12/06 01:14:02 sniper Exp $");
/* php_info_print_table_row(2, "Build date", Ns_InfoBuildDate());
php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile());
php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog());
@@ -512,19 +512,19 @@
* the HTTP header data, so that a script can access these.
*/
#define ADD_STRING(name)
\
- MAKE_STD_ZVAL(pval);
\
- pval->type = IS_STRING;
\
- pval->value.str.len = strlen(buf);
\
- pval->value.str.val = estrndup(buf, pval->value.str.len); \
+ MAKE_STD_ZVAL(zvalue);
\
+ zvalue->type = IS_STRING;
\
+ zvalue->value.str.len = strlen(buf);
\
+ zvalue->value.str.val = estrndup(buf, zvalue->value.str.len); \
zend_hash_update(&EG(symbol_table), name, sizeof(name), \
- &pval, sizeof(zval *), NULL)
+ &zvalue, sizeof(zval *), NULL)
static void
php_roxen_hash_environment(TSRMLS_D)
{
int i;
char buf[512];
- zval *pval;
+ zval *zvalue;
struct svalue *headers;
struct pike_string *sind;
struct array *indices;
@@ -546,22 +546,22 @@
buf_len = MIN(511, ind->u.string->len);
strncpy(buf, ind->u.string->str, buf_len);
buf[buf_len] = '\0'; /* Terminate correctly */
- MAKE_STD_ZVAL(pval);
- pval->type = IS_STRING;
- pval->value.str.len = val->u.string->len;
- pval->value.str.val = estrndup(val->u.string->str, pval->value.str.len);
+ MAKE_STD_ZVAL(zvalue);
+ zvalue->type = IS_STRING;
+ zvalue->value.str.len = val->u.string->len;
+ zvalue->value.str.val = estrndup(val->u.string->str,
zvalue->value.str.len);
- zend_hash_update(&EG(symbol_table), buf, buf_len + 1, &pval,
sizeof(zval *), NULL);
+ zend_hash_update(&EG(symbol_table), buf, buf_len + 1, &zvalue,
sizeof(zval *), NULL);
}
}
free_array(indices);
}
/*
- MAKE_STD_ZVAL(pval);
- pval->type = IS_LONG;
- pval->value.lval = Ns_InfoBootTime();
- zend_hash_update(&EG(symbol_table), "SERVER_BOOTTIME",
sizeof("SERVER_BOOTTIME"), &pval, sizeof(zval *), NULL);
+ MAKE_STD_ZVAL(zvalue);
+ zvalue->type = IS_LONG;
+ zvalue->value.lval = Ns_InfoBootTime();
+ zend_hash_update(&EG(symbol_table), "SERVER_BOOTTIME",
sizeof("SERVER_BOOTTIME"), &zvalue, sizeof(zval *), NULL);
*/
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
