[PHP-CVS] cvs: php-src /sapi/apache_hooks php_apache.c
pajoye Mon Mar 16 10:14:16 2009 UTC
Modified files:
/php-src/sapi/apache_hooks php_apache.c
Log:
- MFB: fix build
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.45r2=1.46diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.45
php-src/sapi/apache_hooks/php_apache.c:1.46
--- php-src/sapi/apache_hooks/php_apache.c:1.45 Tue Mar 10 23:40:01 2009
+++ php-src/sapi/apache_hooks/php_apache.c Mon Mar 16 10:14:16 2009
@@ -17,7 +17,7 @@
| David Sklar sk...@student.net |
+--+
*/
-/* $Id: php_apache.c,v 1.45 2009/03/10 23:40:01 helly Exp $ */
+/* $Id: php_apache.c,v 1.46 2009/03/16 10:14:16 pajoye Exp $ */
#include php_apache_http.h
@@ -722,7 +722,7 @@
}
if (!type) {
- type = REMOTE_NAME
+ type = REMOTE_NAME;
}
APREQ_GET_REQUEST(id, r);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache_hooks php_apache.c
iliaa Sat Mar 7 21:56:52 2009 UTC
Modified files:
/php-src/sapi/apache_hooks php_apache.c
Log:
MFB: Improved parameter handling
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.42r2=1.43diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.42
php-src/sapi/apache_hooks/php_apache.c:1.43
--- php-src/sapi/apache_hooks/php_apache.c:1.42 Mon Feb 2 08:47:09 2009
+++ php-src/sapi/apache_hooks/php_apache.c Sat Mar 7 21:56:52 2009
@@ -17,7 +17,7 @@
| David Sklar sk...@student.net |
+--+
*/
-/* $Id: php_apache.c,v 1.42 2009/02/02 08:47:09 pajoye Exp $ */
+/* $Id: php_apache.c,v 1.43 2009/03/07 21:56:52 iliaa Exp $ */
#include php_apache_http.h
@@ -713,7 +713,7 @@
PHP_FUNCTION(apache_request_remote_host)
{
zval *id;
- long ztype;
+ long ztype = NULL;
request_rec *r;
char *res;
int type = REMOTE_NAME;
@@ -722,15 +722,10 @@
return;
}
- switch (ZEND_NUM_ARGS()) {
- case 0:
- break;
- case 1:
- type = ztype;
- break;
+ if (ztype) {
+ type = ztype;
}
-
APREQ_GET_REQUEST(id, r);
res = (char *)ap_get_remote_host(r-connection, r-per_dir_config,
type);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /sapi/apache_hooks php_apache.c
On 08.03.2009 00:56, Ilia Alshanetsky wrote:
- long ztype;
+ long ztype = NULL;
That doesn't seem right.
+ if (ztype) {
+ type = ztype;
}
And I'm not sure this is correct either.
--
Wbr,
Antony Dovgal
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /sapi/apache_hooks php_apache.c
How so?
Ilia Alshanetsky
On 7-Mar-09, at 5:09 PM, Antony Dovgal wrote:
On 08.03.2009 00:56, Ilia Alshanetsky wrote:
- long ztype;
+ long ztype = NULL;
That doesn't seem right.
+ if (ztype) {
+ type = ztype;
}
And I'm not sure this is correct either.
--
Wbr,
Antony Dovgal
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /sapi/apache_hooks php_apache.c
On 08.03.2009 01:10, Ilia Alshanetsky wrote: How so? Well, it's long and not a pointer. And NOT setting the type if ztype == 0 might be incorrect (depends on the value of REMOTE_NAME). At least previous version of the code always set type if ztype was passed. -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache_hooks php_apache.c
iliaa Sat Mar 7 22:36:42 2009 UTC
Modified files:
/php-src/sapi/apache_hooks php_apache.c
Log:
MFB: Adjust previous fix to avoid compiler warnings
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.43r2=1.44diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.43
php-src/sapi/apache_hooks/php_apache.c:1.44
--- php-src/sapi/apache_hooks/php_apache.c:1.43 Sat Mar 7 21:56:52 2009
+++ php-src/sapi/apache_hooks/php_apache.c Sat Mar 7 22:36:42 2009
@@ -17,7 +17,7 @@
| David Sklar sk...@student.net |
+--+
*/
-/* $Id: php_apache.c,v 1.43 2009/03/07 21:56:52 iliaa Exp $ */
+/* $Id: php_apache.c,v 1.44 2009/03/07 22:36:42 iliaa Exp $ */
#include php_apache_http.h
@@ -713,22 +713,21 @@
PHP_FUNCTION(apache_request_remote_host)
{
zval *id;
- long ztype = NULL;
+ long type = 0;
request_rec *r;
char *res;
- int type = REMOTE_NAME;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |l, ztype) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |l, type) ==
FAILURE) {
return;
}
- if (ztype) {
- type = ztype;
+ if (!type) {
+ type = REMOTE_NAME
}
APREQ_GET_REQUEST(id, r);
- res = (char *)ap_get_remote_host(r-connection, r-per_dir_config,
type);
+ res = (char *)ap_get_remote_host(r-connection, r-per_dir_config,
(int)type);
if (res) {
RETURN_STRING(res, 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache_hooks php_apache.c
pajoye Mon Feb 2 08:47:09 2009 UTC
Modified files:
/php-src/sapi/apache_hooks php_apache.c
Log:
- fix build (use the same arginfo than the aliased func)
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.41r2=1.42diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.41
php-src/sapi/apache_hooks/php_apache.c:1.42
--- php-src/sapi/apache_hooks/php_apache.c:1.41 Fri Jan 30 14:35:22 2009
+++ php-src/sapi/apache_hooks/php_apache.c Mon Feb 2 08:47:09 2009
@@ -17,7 +17,7 @@
| David Sklar sk...@student.net |
+--+
*/
-/* $Id: php_apache.c,v 1.41 2009/01/30 14:35:22 felipe Exp $ */
+/* $Id: php_apache.c,v 1.42 2009/02/02 08:47:09 pajoye Exp $ */
#include php_apache_http.h
@@ -91,7 +91,7 @@
PHP_FE(apache_response_headers,
arginfo_apachehooks__void)
PHP_FE(apache_get_version,
arginfo_apachehooks__void)
PHP_FE(apache_get_modules,
arginfo_apachehooks__void)
- PHP_FALIAS(getallheaders, apache_request_headers,
arginfo_apachehooks_request_headers)
+ PHP_FALIAS(getallheaders, apache_request_headers,
arginfo_apachehooks__void)
{NULL, NULL, NULL}
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache_hooks php_apache.c
felipe Fri Jan 30 14:35:23 2009 UTC
Modified files:
/php-src/sapi/apache_hooks php_apache.c
Log:
- WS, CS
- Added missing param. checking
- Fixed type for 'l'
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.40r2=1.41diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.40
php-src/sapi/apache_hooks/php_apache.c:1.41
--- php-src/sapi/apache_hooks/php_apache.c:1.40 Tue Jan 27 21:59:46 2009
+++ php-src/sapi/apache_hooks/php_apache.c Fri Jan 30 14:35:22 2009
@@ -17,7 +17,7 @@
| David Sklar sk...@student.net |
+--+
*/
-/* $Id: php_apache.c,v 1.40 2009/01/27 21:59:46 iliaa Exp $ */
+/* $Id: php_apache.c,v 1.41 2009/01/30 14:35:22 felipe Exp $ */
#include php_apache_http.h
@@ -63,12 +63,6 @@
ZEND_ARG_INFO(0, filename)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_INFO(arginfo_apachehooks_request_headers, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_apachehooks_response_headers, 0)
-ZEND_END_ARG_INFO()
-
ZEND_BEGIN_ARG_INFO_EX(arginfo_apachehooks_setenv, 0, 0, 2)
ZEND_ARG_INFO(0, variable)
ZEND_ARG_INFO(0, value)
@@ -79,16 +73,7 @@
ZEND_ARG_INFO(0, uri)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_INFO(arginfo_apachehooks_get_version, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_apachehooks_get_modules, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_apachehooks_request_run, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_apachehooks_child_terminate, 0)
+ZEND_BEGIN_ARG_INFO(arginfo_apachehooks__void, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_apachehooks_note, 0, 0, 1)
@@ -98,14 +83,14 @@
const zend_function_entry apache_functions[] = {
PHP_FE(virtual,
arginfo_apachehooks_virtual)
- PHP_FE(apache_request_headers,
arginfo_apachehooks_request_headers)
+ PHP_FE(apache_request_headers,
arginfo_apachehooks__void)
PHP_FE(apache_note,
arginfo_apachehooks_note)
PHP_FE(apache_lookup_uri,
arginfo_apachehooks_lookup_uri)
- PHP_FE(apache_child_terminate,
arginfo_apachehooks_child_terminate)
+ PHP_FE(apache_child_terminate,
arginfo_apachehooks__void)
PHP_FE(apache_setenv,
arginfo_apachehooks_setenv)
- PHP_FE(apache_response_headers,
arginfo_apachehooks_response_headers)
- PHP_FE(apache_get_version,
arginfo_apachehooks_get_version)
- PHP_FE(apache_get_modules,
arginfo_apachehooks_get_modules)
+ PHP_FE(apache_response_headers,
arginfo_apachehooks__void)
+ PHP_FE(apache_get_version,
arginfo_apachehooks__void)
+ PHP_FE(apache_get_modules,
arginfo_apachehooks__void)
PHP_FALIAS(getallheaders, apache_request_headers,
arginfo_apachehooks_request_headers)
{NULL, NULL, NULL}
};
@@ -208,8 +193,9 @@
s = *(char **)((char*)r + offset);
- if (s)
+ if (s) {
RETURN_STRING(s, 1);
+ }
RETURN_EMPTY_STRING();
}
@@ -600,8 +586,9 @@
zend_bool replace = 0;
HashPosition pos;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, z|zb, first,
second, replace) == FAILURE)
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, z|zb, first,
second, replace) == FAILURE) {
RETURN_FALSE;
+ }
if (Z_TYPE_P(first) == IS_ARRAY) {
switch(ZEND_NUM_ARGS()) {
@@ -621,11 +608,11 @@
}
convert_to_string_ex(value);
- if (replace)
+ if (replace) {
ap_table_set(t,
string_key.s, Z_STRVAL_PP(value));
- else
+ } else {
ap_table_merge(t, string_key.s, Z_STRVAL_PP(value));
-
+ }
[PHP-CVS] cvs: php-src /sapi/apache_hooks php_apache.c
iliaa Tue Jan 27 21:59:47 2009 UTC
Modified files:
/php-src/sapi/apache_hooks php_apache.c
Log:
MFB: improved parameter parsing
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.39r2=1.40diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.39
php-src/sapi/apache_hooks/php_apache.c:1.40
--- php-src/sapi/apache_hooks/php_apache.c:1.39 Mon Jan 5 16:24:14 2009
+++ php-src/sapi/apache_hooks/php_apache.c Tue Jan 27 21:59:46 2009
@@ -17,7 +17,7 @@
| David Sklar sk...@student.net |
+--+
*/
-/* $Id: php_apache.c,v 1.39 2009/01/05 16:24:14 iliaa Exp $ */
+/* $Id: php_apache.c,v 1.40 2009/01/27 21:59:46 iliaa Exp $ */
#include php_apache_http.h
@@ -222,7 +222,7 @@
{
zval *id;
request_rec *r;
- char *old_value, *new_value;
+ char *old_value, *new_value = NULL;
int new_value_len;
char **target;
@@ -235,19 +235,13 @@
target = (char **)((char*)r + offset);
old_value = *target;
- switch (ZEND_NUM_ARGS()) {
- case 0:
- break;
- case 1:
- *target = ap_pstrdup(r-pool, new_value);
- break;
- default:
- WRONG_PARAM_COUNT;
- break;
+ if (new_value) {
+ *target = ap_pstrdup(r-pool, new_value);
}
- if (old_value)
+ if (old_value) {
RETURN_STRING(old_value, 1);
+ }
RETURN_EMPTY_STRING();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache_hooks php_apache.c
indeyetsTue Nov 18 19:09:15 2008 UTC
Modified files:
/php-src/sapi/apache_hooks php_apache.c
Log:
MFB: new parameter-parsing api
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.36r2=1.37diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.36
php-src/sapi/apache_hooks/php_apache.c:1.37
--- php-src/sapi/apache_hooks/php_apache.c:1.36 Mon Nov 17 11:26:25 2008
+++ php-src/sapi/apache_hooks/php_apache.c Tue Nov 18 19:09:15 2008
@@ -17,7 +17,7 @@
| David Sklar [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_apache.c,v 1.36 2008/11/17 11:26:25 felipe Exp $ */
+/* $Id: php_apache.c,v 1.37 2008/11/18 19:09:15 indeyets Exp $ */
#include php_apache_http.h
@@ -220,11 +220,16 @@
*/
static void apache_request_string_slot(int offset,
INTERNAL_FUNCTION_PARAMETERS)
{
- zval *id, **new_value;
+ zval *id;
request_rec *r;
- char *old_value;
+ char *old_value, *new_value;
+ int new_value_len;
char **target;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |s, new_value,
new_value_len) == FAILURE) {
+ return;
+ }
+
APREQ_GET_REQUEST(id, r);
target = (char **)((char*)r + offset);
@@ -234,11 +239,7 @@
case 0:
break;
case 1:
- if (zend_get_parameters_ex(1, new_value) == FAILURE) {
- RETURN_FALSE;
- }
- convert_to_string_ex(new_value);
- *target = ap_pstrdup(r-pool, Z_STRVAL_PP(new_value));
+ *target = ap_pstrdup(r-pool, new_value);
break;
default:
WRONG_PARAM_COUNT;
@@ -276,11 +277,15 @@
*/
static void apache_request_int_slot(int offset, INTERNAL_FUNCTION_PARAMETERS)
{
- zval *id, **new_value;
+ zval *id;
request_rec *r;
- long old_value;
+ long old_value, new_value;
long *target;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |l, new_value)
== FAILURE) {
+ return;
+ }
+
APREQ_GET_REQUEST(id, r);
target = (long *)((char*)r + offset);
@@ -290,11 +295,7 @@
case 0:
break;
case 1:
- if (zend_get_parameters_ex(1, new_value) == FAILURE) {
- RETURN_FALSE;
- }
- convert_to_long_ex(new_value);
- *target = Z_LVAL_PP(new_value);
+ *target = new_value;
break;
default:
WRONG_PARAM_COUNT;
@@ -521,24 +522,20 @@
*/
PHP_FUNCTION(apache_request_content_length)
{
- zval *id, **zlen;
+ zval *id;
+ long zlen;
request_rec *r;
- if (ZEND_NUM_ARGS() == 0) {
- apache_request_read_int_slot(offsetof(request_rec, clength),
INTERNAL_FUNCTION_PARAM_PASSTHRU);
- }
- else if (ZEND_NUM_ARGS() 1) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |l, zlen) ==
FAILURE) {
+ return;
}
- else {
- if (zend_get_parameters_ex(1, zlen) == FAILURE) {
- RETURN_FALSE;
- }
+ if (ZEND_NUM_ARGS() == 0) {
+ apache_request_read_int_slot(offsetof(request_rec, clength),
INTERNAL_FUNCTION_PARAM_PASSTHRU);
+ } else {
APREQ_GET_REQUEST(id, r);
- convert_to_long_ex(zlen);
- (void)ap_set_content_length(r, Z_LVAL_PP(zlen));
+ (void)ap_set_content_length(r, zlen);
RETURN_TRUE;
}
}
@@ -733,23 +730,21 @@
*/
PHP_FUNCTION(apache_request_remote_host)
{
- zval *id, **ztype;
+ zval *id;
+ long ztype;
request_rec *r;
char *res;
int type = REMOTE_NAME;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |l, ztype) ==
FAILURE) {
+ return;
+ }
+
switch (ZEND_NUM_ARGS()) {
case 0:
break;
case 1:
- if (zend_get_parameters_ex(1, ztype) == FAILURE) {
- RETURN_FALSE;
- }
- convert_to_long_ex(ztype);
- type = Z_LVAL_PP(ztype);
- break;
- default:
- WRONG_PARAM_COUNT;
+ type = ztype;
break;
}
@@ -757,6 +752,7 @@
APREQ_GET_REQUEST(id, r);
res = (char
[PHP-CVS] cvs: php-src /sapi/apache_hooks php_apache.c
tony2001Thu Dec 28 15:14:39 2006 UTC
Modified files:
/php-src/sapi/apache_hooks php_apache.c
Log:
fix build
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.27r2=1.28diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.27
php-src/sapi/apache_hooks/php_apache.c:1.28
--- php-src/sapi/apache_hooks/php_apache.c:1.27 Thu Dec 28 13:30:18 2006
+++ php-src/sapi/apache_hooks/php_apache.c Thu Dec 28 15:14:39 2006
@@ -17,7 +17,7 @@
| David Sklar [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_apache.c,v 1.27 2006/12/28 13:30:18 tony2001 Exp $ */
+/* $Id: php_apache.c,v 1.28 2006/12/28 15:14:39 tony2001 Exp $ */
#include php_apache_http.h
@@ -554,7 +554,7 @@
APREQ_GET_REQUEST(id, r);
- apache_table_to_zval(r-headers_in, 0, return_value);
+ apache_table_to_zval(r-headers_in, return_value);
}
/* }}} */
@@ -650,7 +650,7 @@
if (ZEND_NUM_ARGS() 0)
add_header_to_table(r-headers_out,
INTERNAL_FUNCTION_PARAM_PASSTHRU);
- apache_table_to_zval(r-headers_out, 0, return_value);
+ apache_table_to_zval(r-headers_out, return_value);
}
/* }}} */
@@ -668,7 +668,7 @@
if (ZEND_NUM_ARGS() 0)
add_header_to_table(r-err_headers_out,
INTERNAL_FUNCTION_PARAM_PASSTHRU);
- apache_table_to_zval(r-err_headers_out, 0, return_value);
+ apache_table_to_zval(r-err_headers_out, return_value);
}
/* }}} */
@@ -1731,7 +1731,7 @@
RETURN_FALSE;
}
- php_output_end_all();
+ php_output_end_all(TSRMLS_C);
php_header(TSRMLS_C);
if (run_sub_req(rr)) {
@@ -1761,9 +1761,7 @@
if (tenv[i].key) {
continue;
}
- if (add_assoc_string(return_value, tenv[i].key,
(tenv[i].val==NULL) ? : tenv[i].val, 1)==FAILURE) {
- RETURN_FALSE;
- }
+ add_assoc_string(return_value, tenv[i].key, (tenv[i].val==NULL)
? : tenv[i].val, 1);
}
}
@@ -1787,7 +1785,7 @@
Fetch all HTTP response headers */
PHP_FUNCTION(apache_response_headers)
{
- apache_table_to_zval(((request_rec *) SG(server_context))-headers_out,
0, return_value);
+ apache_table_to_zval(((request_rec *) SG(server_context))-headers_out,
return_value);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache_hooks php_apache.c
zeevSun May 30 13:53:12 2004 EDT
Modified files:
/php-src/sapi/apache_hooks php_apache.c
Log:
Fix prototypes
http://cvs.php.net/diff.php/php-src/sapi/apache_hooks/php_apache.c?r1=1.16r2=1.17ty=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.16
php-src/sapi/apache_hooks/php_apache.c:1.17
--- php-src/sapi/apache_hooks/php_apache.c:1.16 Thu Jan 8 03:18:06 2004
+++ php-src/sapi/apache_hooks/php_apache.c Sun May 30 13:53:12 2004
@@ -17,7 +17,7 @@
| David Sklar [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_apache.c,v 1.16 2004/01/08 08:18:06 andi Exp $ */
+/* $Id: php_apache.c,v 1.17 2004/05/30 17:53:12 zeev Exp $ */
#include php_apache_http.h
@@ -273,7 +273,7 @@
/* {{{ access string slots of request rec
*/
-/* {{{ proto string $request-filename([string new_filename])
+/* {{{ proto string ApacheRequest::filename([string new_filename])
*/
PHP_FUNCTION(apache_request_filename)
{
@@ -281,7 +281,7 @@
}
/* }}} */
-/* {{{ proto string $request-uri([string new_uri])
+/* {{{ proto string ApacheRequest::uri([string new_uri])
*/
PHP_FUNCTION(apache_request_uri)
{
@@ -289,7 +289,7 @@
}
/* }}} */
-/* {{{ proto string $request-unparsed_uri([string new_unparsed_uri])
+/* {{{ proto string ApacheRequest::unparsed_uri([string new_unparsed_uri])
*/
PHP_FUNCTION(apache_request_unparsed_uri)
{
@@ -297,7 +297,7 @@
}
/* }}} */
-/* {{{ proto string $request-path_info([string new_path_info])
+/* {{{ proto string ApacheRequest::path_info([string new_path_info])
*/
PHP_FUNCTION(apache_request_path_info)
{
@@ -305,7 +305,7 @@
}
/* }}} */
-/* {{{ proto string $request-args([string new_args])
+/* {{{ proto string ApacheRequest::args([string new_args])
*/
PHP_FUNCTION(apache_request_args)
{
@@ -313,7 +313,7 @@
}
/* }}} */
-/* {{{ proto string $request-boundary()
+/* {{{ proto string ApacheRequest::boundary()
*/
PHP_FUNCTION(apache_request_boundary)
{
@@ -322,7 +322,7 @@
/* }}} */
-/* {{{ proto string $request-content_type([string new_type])
+/* {{{ proto string ApacheRequest::content_type([string new_type])
*/
PHP_FUNCTION(apache_request_content_type)
{
@@ -330,7 +330,7 @@
}
/* }}} */
-/* {{{ proto string $request-content_encoding([string new_encoding])
+/* {{{ proto string ApacheRequest::content_encoding([string new_encoding])
*/
PHP_FUNCTION(apache_request_content_encoding)
{
@@ -338,7 +338,7 @@
}
/* }}} */
-/* {{{ proto string $request-handler([string new_handler])
+/* {{{ proto string ApacheRequest::handler([string new_handler])
*/
PHP_FUNCTION(apache_request_handler)
{
@@ -346,7 +346,7 @@
}
/* }}} */
-/* {{{ proto string $request-the_request()
+/* {{{ proto string ApacheRequest::the_request()
*/
PHP_FUNCTION(apache_request_the_request)
{
@@ -354,7 +354,7 @@
}
/* }}} */
-/* {{{ proto string $request-protocol()
+/* {{{ proto string ApacheRequest::protocol()
*/
PHP_FUNCTION(apache_request_protocol)
{
@@ -362,7 +362,7 @@
}
/* }}} */
-/* {{{ proto string $request-hostname()
+/* {{{ proto string ApacheRequest::hostname()
*/
PHP_FUNCTION(apache_request_hostname)
{
@@ -370,7 +370,7 @@
}
/* }}} */
-/* {{{ proto string $request-status_line([string new_status_line])
+/* {{{ proto string ApacheRequest::status_line([string new_status_line])
*/
PHP_FUNCTION(apache_request_status_line)
{
@@ -378,7 +378,7 @@
}
/* }}} */
-/* {{{ proto string $request-method()
+/* {{{ proto string ApacheRequest::method()
*/
PHP_FUNCTION(apache_request_method)
{
@@ -391,7 +391,7 @@
/* {{{ access int slots of request_rec
*/
-/* {{{ proto int $request-proto_num()
+/* {{{ proto int ApacheRequest::proto_num()
*/
PHP_FUNCTION(apache_request_proto_num)
{
@@ -399,7 +399,7 @@
}
/* }}} */
-/* {{{ proto int $request-assbackwards()
+/* {{{ proto int ApacheRequest::assbackwards()
*/
PHP_FUNCTION(apache_request_assbackwards)
{
@@ -408,7 +408,7 @@
/* }}} */
-/* {{{ proto int $request-proxyreq([int new_proxyreq])
+/* {{{ proto int ApacheRequest::proxyreq([int new_proxyreq])
*/
PHP_FUNCTION(apache_request_proxyreq)
{
@@ -416,7 +416,7 @@
}
/* }}} */
-/* {{{ proto int $request-chunked()
+/* {{{ proto int ApacheRequest::chunked()
*/
PHP_FUNCTION(apache_request_chunked)
{
@@ -425,7 +425,7 @@
/* }}} */
-/* {{{ proto int $request-header_only()
+/* {{{ proto int ApacheRequest::header_only()
*/
PHP_FUNCTION(apache_request_header_only)
{
@@ -433,7 +433,7 @@
}
/* }}} */
-/* {{{ proto int $request-request_time()
+/* {{{ proto int ApacheRequest::request_time()
*/
PHP_FUNCTION(apache_request_request_time)
{
@@ -441,7 +441,7 @@
}
/* }}} */
-/* {{{ proto int $request-status([int new_status])
+/* {{{ proto int ApacheRequest::status([int new_status])
*/
PHP_FUNCTION(apache_request_status)
{
@@ -449,7 +449,7 @@
}
/* }}}
[PHP-CVS] cvs: php-src /sapi/apache_hooks php_apache.c
hholzgraWed Nov 19 15:13:50 2003 EDT
Modified files:
/php-src/sapi/apache_hooks php_apache.c
Log:
proto fix
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.14
php-src/sapi/apache_hooks/php_apache.c:1.15
--- php-src/sapi/apache_hooks/php_apache.c:1.14 Tue Jun 10 16:03:44 2003
+++ php-src/sapi/apache_hooks/php_apache.c Wed Nov 19 15:13:49 2003
@@ -17,7 +17,7 @@
| David Sklar [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_apache.c,v 1.14 2003/06/10 20:03:44 imajes Exp $ */
+/* $Id: php_apache.c,v 1.15 2003/11/19 20:13:49 hholzgra Exp $ */
#include php_apache_http.h
@@ -1228,7 +1228,7 @@
}
/* }}} */
-/* {{{ proto long apache_request_run
+/* {{{ proto long apache_request_run()
This is a wrapper for ap_sub_run_req and ap_destory_sub_req. It takes
sub_request, runs it, destroys it, and returns it's status.
*/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
