[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
thetaphi Tue, 23 Aug 2011 17:03:19 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315377 Log: Fix NEWS entries for ongoing 5.3.9 development Changed paths: U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2011-08-23 16:40:19 UTC (rev 315376) +++ php/php-src/branches/PHP_5_3/NEWS 2011-08-23 17:03:19 UTC (rev 315377) @@ -2,10 +2,7 @@ ||| ?? ??? 2011, PHP 5.3.9 -23 Aug 2011, PHP 5.3.8 - - Core: - . Fixed bug #55439 (crypt() returns only the salt for MD5). (Stas) . Fixed bug #52461 (Incomplete doctype and missing xmlns). (virsacer at web dot de, Pierre) @@ -13,9 +10,15 @@ . Don't set $_SERVER['HTTPS'] on unsecure connection (bug #55403). (Uwe Schindler) +23 Aug 2011, PHP 5.3.8 + +- Core: + . Fixed bug #55439 (crypt() returns only the salt for MD5). (Stas) + - OpenSSL: - . Reverted a change in timeout handling restoring PHP 5.3.6 behavior. (Pierre, -Andrey, Johannes) + . Reverted a change in timeout handling restoring PHP 5.3.6 behavior, +as the new behavior caused mysqlnd SSL connections to hang (#55283). +(Pierre, Andrey, Johannes) 18 Aug 2011, PHP 5.3.7 - Upgraded bundled SQLite to version 3.7.7.1. (Scott) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS sapi/nsapi/nsapi.c
thetaphi Thu, 18 Aug 2011 19:12:49 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=315149
Log:
Bug #55403: Don't set $_SERVER['HTTPS'] on unsecure connection
Bug: https://bugs.php.net/55403 (Assigned) $_SERVER['HTTPS'] should be
undefined on unsecure connection
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2011-08-18 17:32:37 UTC (rev 315148)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-08-18 19:12:49 UTC (rev 315149)
@@ -2,6 +2,9 @@
|||
?? ??? 2011, PHP 5.3.8
+- Improved NSAPI SAPI: (Uwe Schindler)
+ . Don't set $_SERVER['HTTPS'] on unsecure connection (bug #55403).
+
18 Aug 2011, PHP 5.3.7
- Upgraded bundled SQLite to version 3.7.7.1. (Scott)
- Upgraded bundled PCRE to version 8.12. (Scott)
Modified: php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c
===
--- php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c 2011-08-18 17:32:37 UTC
(rev 315148)
+++ php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c 2011-08-18 19:12:49 UTC
(rev 315149)
@@ -727,7 +727,9 @@
nsapi_free(value);
php_register_variable(SERVER_SOFTWARE, system_version(),
track_vars_array TSRMLS_CC);
- php_register_variable(HTTPS, (security_active ? ON : OFF),
track_vars_array TSRMLS_CC);
+ if (security_active) {
+ php_register_variable(HTTPS, ON, track_vars_array
TSRMLS_CC);
+ }
php_register_variable(GATEWAY_INTERFACE, CGI/1.1, track_vars_array
TSRMLS_CC);
/* DOCUMENT_ROOT */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/sapi/nsapi/nsapi.c trunk/sapi/nsapi/nsapi.c
thetaphi Thu, 11 Aug 2011 20:25:24 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=314799
Log:
Bug #55403: Don't set $_SERVER['HTTPS'] on unsecure connection
Bug: https://bugs.php.net/55403 (Assigned) $_SERVER['HTTPS'] should be
undefined on unsecure connection
Changed paths:
U php/php-src/branches/PHP_5_4/NEWS
U php/php-src/branches/PHP_5_4/sapi/nsapi/nsapi.c
U php/php-src/trunk/sapi/nsapi/nsapi.c
Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS 2011-08-11 20:18:05 UTC (rev 314798)
+++ php/php-src/branches/PHP_5_4/NEWS 2011-08-11 20:25:24 UTC (rev 314799)
@@ -12,6 +12,9 @@
. Added Shift_JIS Emoji (pictograms) support. (rui)
. Ill-formed UTF-8 check for security enhancements. (rui)
+- Improved NSAPI SAPI: (Uwe Schindler)
+ . Don't set $_SERVER['HTTPS'] on unsecure connection (bug #55403).
+
04 Aug 2011, PHP 5.4.0 Alpha 3
- Added features:
. Short array syntax, see UPGRADING guide for full details (rsky0711 at gmail
Modified: php/php-src/branches/PHP_5_4/sapi/nsapi/nsapi.c
===
--- php/php-src/branches/PHP_5_4/sapi/nsapi/nsapi.c 2011-08-11 20:18:05 UTC
(rev 314798)
+++ php/php-src/branches/PHP_5_4/sapi/nsapi/nsapi.c 2011-08-11 20:25:24 UTC
(rev 314799)
@@ -723,7 +723,9 @@
nsapi_free(value);
php_register_variable(SERVER_SOFTWARE, system_version(),
track_vars_array TSRMLS_CC);
- php_register_variable(HTTPS, (security_active ? ON : OFF),
track_vars_array TSRMLS_CC);
+ if (security_active) {
+ php_register_variable(HTTPS, ON, track_vars_array
TSRMLS_CC);
+ }
php_register_variable(GATEWAY_INTERFACE, CGI/1.1, track_vars_array
TSRMLS_CC);
/* DOCUMENT_ROOT */
Modified: php/php-src/trunk/sapi/nsapi/nsapi.c
===
--- php/php-src/trunk/sapi/nsapi/nsapi.c2011-08-11 20:18:05 UTC (rev
314798)
+++ php/php-src/trunk/sapi/nsapi/nsapi.c2011-08-11 20:25:24 UTC (rev
314799)
@@ -723,7 +723,9 @@
nsapi_free(value);
php_register_variable(SERVER_SOFTWARE, system_version(),
track_vars_array TSRMLS_CC);
- php_register_variable(HTTPS, (security_active ? ON : OFF),
track_vars_array TSRMLS_CC);
+ if (security_active) {
+ php_register_variable(HTTPS, ON, track_vars_array
TSRMLS_CC);
+ }
php_register_variable(GATEWAY_INTERFACE, CGI/1.1, track_vars_array
TSRMLS_CC);
/* DOCUMENT_ROOT */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/sapi/nsapi/ nsapi.c
thetaphi Thu, 19 Nov 2009 22:13:15 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=291041
Log:
Fix compile error because of wrong merging from 5.3 branch.
TODO: Convert $SERVER[] variables to unicode also for NSAPI (see
apache2_handler)
Changed paths:
U php/php-src/trunk/sapi/nsapi/nsapi.c
Modified: php/php-src/trunk/sapi/nsapi/nsapi.c
===
--- php/php-src/trunk/sapi/nsapi/nsapi.c2009-11-19 21:52:48 UTC (rev
291040)
+++ php/php-src/trunk/sapi/nsapi/nsapi.c2009-11-19 22:13:15 UTC (rev
291041)
@@ -729,7 +729,7 @@
/* DOCUMENT_ROOT */
if (value = request_translate_uri(/, rc-sn)) {
pos = strlen(value);
- php_register_variable_safe(DOCUMENT_ROOT, value, pos-1,
track_vars_array TSRMLS_CC);
+ php_register_variable_safe(IS_STRING, ZSTR(DOCUMENT_ROOT),
ZSTR(value), pos-1, track_vars_array TSRMLS_CC);
nsapi_free(value);
}
@@ -753,7 +753,7 @@
efree(value);
}
} else {
- php_register_variable_safe(REQUEST_URI,
SG(request_info).request_uri, pos, track_vars_array TSRMLS_CC);
+ php_register_variable_safe(IS_STRING,
ZSTR(REQUEST_URI), ZSTR(SG(request_info).request_uri), pos, track_vars_array
TSRMLS_CC);
}
if (rc-path_info) {
@@ -762,7 +762,7 @@
pos = 0;
}
}
- php_register_variable_safe(SCRIPT_NAME,
SG(request_info).request_uri, pos, track_vars_array TSRMLS_CC);
+ php_register_variable_safe(IS_STRING, ZSTR(SCRIPT_NAME),
ZSTR(SG(request_info).request_uri), pos, track_vars_array TSRMLS_CC);
}
php_register_variable(SCRIPT_FILENAME,
SG(request_info).path_translated, track_vars_array TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/sapi/nsapi/nsapi.c trunk/sapi/nsapi/nsapi.c
thetaphi Tue, 17 Nov 2009 21:17:49 + Revision: http://svn.php.net/viewvc?view=revisionrevision=290887 Log: Fix bug #50140: With default compilation option, php symbols are unresolved for nsapi Bug: http://bugs.php.net/50140 (Feedback) [PATCH] With default compilation option, php symbols are unresolved for nsapi Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c U php/php-src/trunk/sapi/nsapi/nsapi.c Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2009-11-17 20:41:47 UTC (rev 290886) +++ php/php-src/branches/PHP_5_3/NEWS 2009-11-17 21:17:49 UTC (rev 290887) @@ -21,6 +21,8 @@ - Fixed memory leak in extension loading when an error occurs on Windows. (Pierre) +- Fixed bug #50140 (With default compilation option, php symbols are + unresolved for nsapi). (Uwe Schindler) - Fixed bug #50174 (Incorrectly matched docComment). (Felipe) - Fixed bug #50158 (FILTER_VALIDATE_EMAIL fails with valid addresses containing = or ?). (Pierrick) Modified: php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c === --- php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c 2009-11-17 20:41:47 UTC (rev 290886) +++ php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c 2009-11-17 21:17:49 UTC (rev 290887) @@ -68,6 +68,12 @@ */ #include nsapi.h +/* fix for gcc4 visibility issue */ +#ifndef PHP_WIN32 +# undef NSAPI_PUBLIC +# define NSAPI_PUBLIC PHPAPI +#endif + #define NSLS_D struct nsapi_request_context *request_context #define NSLS_DC, NSLS_D #define NSLS_C request_context Modified: php/php-src/trunk/sapi/nsapi/nsapi.c === --- php/php-src/trunk/sapi/nsapi/nsapi.c2009-11-17 20:41:47 UTC (rev 290886) +++ php/php-src/trunk/sapi/nsapi/nsapi.c2009-11-17 21:17:49 UTC (rev 290887) @@ -68,6 +68,12 @@ */ #include nsapi.h +/* fix for gcc4 visibility issue */ +#ifndef PHP_WIN32 +# undef NSAPI_PUBLIC +# define NSAPI_PUBLIC PHPAPI +#endif + #define NSLS_D struct nsapi_request_context *request_context #define NSLS_DC, NSLS_D #define NSLS_C request_context -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/sapi/nsapi/nsapi.c trunk/sapi/nsapi/nsapi.c
thetaphi Thu, 12 Nov 2009 15:19:35 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=290582
Log:
Fix bug #50087: NSAPI performance improvements
Bug: http://bugs.php.net/50087 (Open) [PATCH] - NSAPI performance improvements
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c
U php/php-src/trunk/sapi/nsapi/nsapi.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-11-12 15:14:12 UTC (rev 290581)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-11-12 15:19:35 UTC (rev 290582)
@@ -20,6 +20,7 @@
- Fixed memory leak in extension loading when an error occurs on Windows.
(Pierre)
+- Fixed bug #50087 (NSAPI performance improvements). (Uwe Schindler)
- Fixed bug #50152 (ReflectionClass::hasProperty behaves like isset() not
property_exists). (Felipe)
- Fixed bug #50146 (property_exists: Closure object cannot have properties).
Modified: php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c
===
--- php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c 2009-11-12 15:14:12 UTC (rev 290581)
+++ php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c 2009-11-12 15:19:35 UTC (rev 290582)
@@ -131,14 +131,6 @@
/* this parameters to Service/Error are NSAPI ones which should not be php.ini keys and are excluded */
static char *nsapi_exclude_from_ini_entries[] = { fn, type, method, directive, code, reason, script, bucket, NULL };
-static char *nsapi_strdup(char *str)
-{
- if (str != NULL) {
- return STRDUP(str);
- }
- return NULL;
-}
-
static void nsapi_free(void *addr)
{
if (addr != NULL) {
@@ -500,7 +492,7 @@
nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
/* copy the header, because NSAPI needs reformatting and we do not want to change the parameter */
- header_name = nsapi_strdup(sapi_header-header);
+ header_name = pool_strdup(rc-sn-pool, sapi_header-header);
/* extract name, this works, if only the header without ':' is given, too */
if (p = strchr(header_name, ':')) {
@@ -514,7 +506,7 @@
/* remove the header */
param_free(pblock_remove(header_name, rc-rq-srvhdrs));
- nsapi_free(header_name);
+ pool_free(rc-sn-pool, header_name);
return ZEND_HASH_APPLY_KEEP;
}
@@ -538,7 +530,7 @@
case SAPI_HEADER_ADD:
case SAPI_HEADER_REPLACE:
/* copy the header, because NSAPI needs reformatting and we do not want to change the parameter */
- header_name = nsapi_strdup(sapi_header-header);
+ header_name = pool_strdup(rc-sn-pool, sapi_header-header);
/* split header and align pointer for content */
header_content = strchr(header_name, ':');
@@ -561,7 +553,7 @@
pblock_nvinsert(header_name, header_content, rc-rq-srvhdrs);
}
- nsapi_free(header_name);
+ pool_free(rc-sn-pool, header_name);
return SAPI_HEADER_ADD;
default:
@@ -750,6 +742,8 @@
/* Create full Request-URI Script-Name */
if (SG(request_info).request_uri) {
+ pos = strlen(SG(request_info).request_uri);
+
if (SG(request_info).query_string) {
spprintf(value, 0, %s?%s, SG(request_info).request_uri, SG(request_info).query_string);
if (value) {
@@ -757,21 +751,16 @@
efree(value);
}
} else {
- php_register_variable(REQUEST_URI, SG(request_info).request_uri, track_vars_array TSRMLS_CC);
+ php_register_variable_safe(REQUEST_URI, SG(request_info).request_uri, pos, track_vars_array TSRMLS_CC);
}
- if (value = nsapi_strdup(SG(request_info).request_uri)) {
- if (rc-path_info) {
-pos = strlen(SG(request_info).request_uri) - strlen(rc-path_info);
-if (pos=0) {
- value[pos] = '\0';
-} else {
- value[0]='\0';
-}
+ if (rc-path_info) {
+ pos -= strlen(rc-path_info);
+ if (pos0) {
+pos = 0;
}
- php_register_variable(SCRIPT_NAME, value, track_vars_array TSRMLS_CC);
- nsapi_free(value);
}
+ php_register_variable_safe(SCRIPT_NAME, SG(request_info).request_uri, pos, track_vars_array TSRMLS_CC);
}
php_register_variable(SCRIPT_FILENAME, SG(request_info).path_translated, track_vars_array TSRMLS_CC);
@@ -1014,21 +1003,25 @@
}
}
- request_context = (nsapi_request_context *)MALLOC(sizeof(nsapi_request_context));
+ request_context = (nsapi_request_context *)pool_malloc(sn-pool, sizeof(nsapi_request_context));
+ if (!request_context) {
+ log_error(LOG_CATASTROPHE, pblock_findval(fn, pb), sn, rq, Insufficient memory to process PHP request!);
+ return REQ_ABORTED;
+ }
request_context-pb = pb;
request_context-sn = sn;
request_context-rq = rq;
request_context-read_post_bytes = 0;
request_context-fixed_script = fixed_script;
request_context-http_error = (error_directive) ? rq-status_num : 0;
- request_context-path_info = nsapi_strdup(path_info);
+ request_context-path_info = path_info;
SG(server_context) = request_context;
- SG
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/sapi/nsapi/nsapi.c trunk/sapi/nsapi/nsapi.c
thetaphi Thu, 12 Nov 2009 17:13:05 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=290591
Log:
As I am working on it, further improvement for bug #50087
Bug: http://bugs.php.net/50087 (Closed) [PATCH] - NSAPI performance improvements
Changed paths:
U php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c
U php/php-src/trunk/sapi/nsapi/nsapi.c
Modified: php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c
===
--- php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c 2009-11-12 16:39:09 UTC
(rev 290590)
+++ php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c 2009-11-12 17:13:05 UTC
(rev 290591)
@@ -726,8 +726,8 @@
/* DOCUMENT_ROOT */
if (value = request_translate_uri(/, rc-sn)) {
- value[strlen(value) - 1] = '\0';
- php_register_variable(DOCUMENT_ROOT, value, track_vars_array
TSRMLS_CC);
+ pos = strlen(value);
+ php_register_variable_safe(DOCUMENT_ROOT, value, pos-1,
track_vars_array TSRMLS_CC);
nsapi_free(value);
}
Modified: php/php-src/trunk/sapi/nsapi/nsapi.c
===
--- php/php-src/trunk/sapi/nsapi/nsapi.c2009-11-12 16:39:09 UTC (rev
290590)
+++ php/php-src/trunk/sapi/nsapi/nsapi.c2009-11-12 17:13:05 UTC (rev
290591)
@@ -722,8 +722,8 @@
/* DOCUMENT_ROOT */
if (value = request_translate_uri(/, rc-sn)) {
- value[strlen(value) - 1] = '\0';
- php_register_variable(DOCUMENT_ROOT, value, track_vars_array
TSRMLS_CC);
+ pos = strlen(value);
+ php_register_variable_safe(DOCUMENT_ROOT, value, pos-1,
track_vars_array TSRMLS_CC);
nsapi_free(value);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/sapi/nsapi/ nsapi.c
thetaphi Mon, 03 Aug 2009 10:12:30 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286721 Log: Fix bug #46020: With Sun Java System Web Server 7.0 on HPUX, #define HPUX Bug: http://bugs.php.net/46020 (Assigned) With Sun Java System Web Server 7.0 on HPUX, #define HPUX Changed paths: U php/php-src/trunk/sapi/nsapi/nsapi.c Modified: php/php-src/trunk/sapi/nsapi/nsapi.c === --- php/php-src/trunk/sapi/nsapi/nsapi.c2009-08-03 09:48:53 UTC (rev 286720) +++ php/php-src/trunk/sapi/nsapi/nsapi.c2009-08-03 10:12:30 UTC (rev 286721) @@ -57,6 +57,13 @@ #endif /* + * The manual define of HPUX is to fix bug #46020, nsapi.h needs this to detect HPUX + */ +#ifdef __hpux +#define HPUX +#endif + +/* * NSAPI includes */ #include nsapi.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS sapi/nsapi/nsapi.c
thetaphi Mon, 03 Aug 2009 10:13:49 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286722 Log: MFH: Fix bug #46020: With Sun Java System Web Server 7.0 on HPUX, #define HPUX Bug: http://bugs.php.net/46020 (Assigned) With Sun Java System Web Server 7.0 on HPUX, #define HPUX Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2009-08-03 10:12:30 UTC (rev 286721) +++ php/php-src/branches/PHP_5_3/NEWS 2009-08-03 10:13:49 UTC (rev 286722) @@ -7,6 +7,8 @@ Stas) - Fixed signature generation/validation for zip archives in ext/phar. (Greg) +- Fixed bug #46020 (with Sun Java System Web Server 7.0 on HPUX, #define HPUX). + (Uwe Schindler) - Fixed bug #49132 (posix_times returns false without error). (phpbugs at gunnu dot us) - Fixed bug #49125 (Error in dba_exists C code). (jdornan at stanford dot edu) Modified: php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c === --- php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c 2009-08-03 10:12:30 UTC (rev 286721) +++ php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c 2009-08-03 10:13:49 UTC (rev 286722) @@ -55,6 +55,13 @@ #define XP_UNIX #endif #endif + +/* + * The manual define of HPUX is to fix bug #46020, nsapi.h needs this to detect HPUX + */ +#ifdef __hpux +#define HPUX +#endif /* * NSAPI includes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS sapi/nsapi/nsapi.c
thetaphi Mon, 03 Aug 2009 10:14:20 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286723 Log: MFH: Fix bug #46020: With Sun Java System Web Server 7.0 on HPUX, #define HPUX Bug: http://bugs.php.net/46020 (Assigned) With Sun Java System Web Server 7.0 on HPUX, #define HPUX Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/sapi/nsapi/nsapi.c Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-08-03 10:13:49 UTC (rev 286722) +++ php/php-src/branches/PHP_5_2/NEWS 2009-08-03 10:14:20 UTC (rev 286723) @@ -4,6 +4,8 @@ - Fixed regression in cURL extension that prevented flush of data to output defined as a file handle. (Ilia) +- Fixed bug #46020 (with Sun Java System Web Server 7.0 on HPUX, #define HPUX). + (Uwe Schindler) - Fixed bug #49132 (posix_times returns false without error). (phpbugs at gunnu dot us) - Fixed bug #49125 (Error in dba_exists C code). (jdornan at stanford dot edu) Modified: php/php-src/branches/PHP_5_2/sapi/nsapi/nsapi.c === --- php/php-src/branches/PHP_5_2/sapi/nsapi/nsapi.c 2009-08-03 10:13:49 UTC (rev 286722) +++ php/php-src/branches/PHP_5_2/sapi/nsapi/nsapi.c 2009-08-03 10:14:20 UTC (rev 286723) @@ -57,6 +57,13 @@ #endif /* + * The manual define of HPUX is to fix bug #46020, nsapi.h needs this to detect HPUX + */ +#ifdef __hpux +#define HPUX +#endif + +/* * NSAPI includes */ #include nsapi.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
RE: [PHP-CVS] svn: /php/php-src/trunk/sapi/nsapi/ nsapi.c
Thanks Jani, I thought it is still optional to do this. The question is, how to do that on Windows with TortoiseSVN using the GUI? We had a similar discussion on the Lucene-Java Mailinglist about updating the backwards-compatibility tests branch with one commit together with trunk. - Uwe Schindler theta...@php.net - http://www.php.net NSAPI SAPI developer Bremen, Germany -Original Message- From: Jani Taskinen [mailto:j...@php.net] Sent: Monday, August 03, 2009 12:26 PM To: Uwe Schindler Cc: php-cvs@lists.php.net; gwy...@php.net Subject: Re: [PHP-CVS] svn: /php/php-src/trunk/sapi/nsapi/ nsapi.c Please use the single-commit way instead of doing multiple commits. Especially when you fix bugs..now there are 3 commit entries in that report. :D See also: http://wiki.php.net/vcs/svnfaq#sparse_directory_checkout_instructions --Jani On 08/03/2009 01:12 PM, Uwe Schindler wrote: thetaphi Mon, 03 Aug 2009 10:12:30 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286721 Log: Fix bug #46020: With Sun Java System Web Server 7.0 on HPUX, #define HPUX Bug: http://bugs.php.net/46020 (Assigned) With Sun Java System Web Server 7.0 on HPUX, #define HPUX Changed paths: U php/php-src/trunk/sapi/nsapi/nsapi.c Modified: php/php-src/trunk/sapi/nsapi/nsapi.c === --- php/php-src/trunk/sapi/nsapi/nsapi.c2009-08-03 09:48:53 UTC (rev 286720) +++ php/php-src/trunk/sapi/nsapi/nsapi.c2009-08-03 10:12:30 UTC (rev 286721) @@ -57,6 +57,13 @@ #endif /* + * The manual define of HPUX is to fix bug #46020, nsapi.h needs this to detect HPUX + */ +#ifdef __hpux +#define HPUX +#endif + +/* * NSAPI includes */ #include nsapi.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
RE: [PHP-CVS] svn: /php/php-src/trunk/sapi/nsapi/ nsapi.c
On 08/03/2009 01:36 PM, Uwe Schindler wrote: Thanks Jani, I thought it is still optional to do this. Semi-optional. Since we use svn, why not fully make use of the features it provides? +1. But excuse my fault, it was my first commit since the SVN migration. The question is, how to do that on Windows with TortoiseSVN using the GUI? No idea..is it not possible? Use some other svn client? Or commit from command line, it's not that hard..? (no idea if that's possible in windows..I don't do clickety-click stuff) I got it, it works with TortoiseSVN, too. You can specify in the GUI to checkout only the immediates and so on. When you want to checkout one branch in complete, you can just use the Update to revision menu item and specify HEAD (as we do not want to update a specific revision like the menu item name suggests) and then use fully recursive. I think I could update the Wiki with a short HowTo. I like TortoiseSVN to manage my checkouts, because it colors the folder and file icons and you can quickly see whats updated. We had a similar discussion on the Lucene-Java Mailinglist about updating the backwards-compatibility tests branch with one commit together with trunk. - Uwe Schindler theta...@php.net - http://www.php.net NSAPI SAPI developer Bremen, Germany -Original Message- From: Jani Taskinen [mailto:j...@php.net] Sent: Monday, August 03, 2009 12:26 PM To: Uwe Schindler Cc: php-cvs@lists.php.net; gwy...@php.net Subject: Re: [PHP-CVS] svn: /php/php-src/trunk/sapi/nsapi/ nsapi.c Please use the single-commit way instead of doing multiple commits. Especially when you fix bugs..now there are 3 commit entries in that report. :D See also: http://wiki.php.net/vcs/svnfaq#sparse_directory_checkout_instructions --Jani On 08/03/2009 01:12 PM, Uwe Schindler wrote: thetaphi Mon, 03 Aug 2009 10:12:30 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286721 Log: Fix bug #46020: With Sun Java System Web Server 7.0 on HPUX, #define HPUX Bug: http://bugs.php.net/46020 (Assigned) With Sun Java System Web Server 7.0 on HPUX, #define HPUX Changed paths: U php/php-src/trunk/sapi/nsapi/nsapi.c Modified: php/php-src/trunk/sapi/nsapi/nsapi.c === --- php/php-src/trunk/sapi/nsapi/nsapi.c 2009-08-03 09:48:53 UTC (rev 286720) +++ php/php-src/trunk/sapi/nsapi/nsapi.c 2009-08-03 10:12:30 UTC (rev 286721) @@ -57,6 +57,13 @@ #endif /* + * The manual define of HPUX is to fix bug #46020, nsapi.h needs this to detect HPUX + */ +#ifdef __hpux +#define HPUX +#endif + +/* * NSAPI includes */ #include nsapi.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/nsapi nsapi.c
thetaphiMon Mar 23 23:13:14 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/nsapi nsapi.c
Log:
MFH: Fix a sigsegv on server shutdown, add missing sapi_shutdown().
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.6.2.18r2=1.69.2.3.2.6.2.19diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.18
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.19
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.18Sun Jan 11 13:47:01 2009
+++ php-src/sapi/nsapi/nsapi.c Mon Mar 23 23:13:14 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.6.2.18 2009/01/11 13:47:01 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.6.2.19 2009/03/23 23:13:14 thetaphi Exp $ */
/*
* PHP includes
@@ -307,7 +307,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.6.2.18 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.6.2.19 $);
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 );
@@ -468,6 +468,11 @@
{
nsapi_request_context *rc = (nsapi_request_context *)server_context;
TSRMLS_FETCH();
+
+ if (!rc) {
+ /* we have no context, so no flushing needed. This fixes a
SIGSEGV on shutdown */
+ return;
+ }
if (!SG(headers_sent)) {
sapi_send_headers(TSRMLS_C);
@@ -882,6 +887,7 @@
}
#endif
+ sapi_shutdown();
tsrm_shutdown();
log_error(LOG_INFORM, php5_close, NULL, NULL, Shutdown PHP Module);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
thetaphiFri Mar 20 15:53:34 2009 UTC
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
Fix a sigsegv on server shutdown, add missing sapi_shutdown().
!!! This should also be merged into 5.3, I prepared it, please tell me if it
is ok to commit !!!
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.103r2=1.104diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.103 php-src/sapi/nsapi/nsapi.c:1.104
--- php-src/sapi/nsapi/nsapi.c:1.103Sun Jan 11 13:46:45 2009
+++ php-src/sapi/nsapi/nsapi.c Fri Mar 20 15:53:34 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.103 2009/01/11 13:46:45 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.104 2009/03/20 15:53:34 thetaphi Exp $ */
/*
* PHP includes
@@ -307,7 +307,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.103
$);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.104
$);
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 );
@@ -466,6 +466,11 @@
{
nsapi_request_context *rc = (nsapi_request_context *)server_context;
TSRMLS_FETCH();
+
+ if (!rc) {
+ /* we have no context, so no flushing needed. This fixes a
SIGSEGV on shutdown */
+ return;
+ }
if (!SG(headers_sent)) {
sapi_send_headers(TSRMLS_C);
@@ -878,6 +883,7 @@
}
#endif
+ sapi_shutdown();
tsrm_shutdown();
log_error(LOG_INFORM, php6_close, NULL, NULL, Shutdown PHP Module);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/nsapi nsapi.c
thetaphiFri Mar 20 15:54:36 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/nsapi nsapi.c
Log:
Fix a sigsegv on server shutdown, add missing sapi_shutdown().
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.17r2=1.69.2.3.2.18diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.17
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.18
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.17Wed Feb 25 19:52:06 2009
+++ php-src/sapi/nsapi/nsapi.c Fri Mar 20 15:54:36 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.17 2009/02/25 19:52:06 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.18 2009/03/20 15:54:36 thetaphi Exp $ */
/*
* PHP includes
@@ -294,7 +294,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.17 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.18 $);
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 );
@@ -455,6 +455,11 @@
{
nsapi_request_context *rc = (nsapi_request_context *)server_context;
TSRMLS_FETCH();
+
+ if (!rc) {
+ /* we have no context, so no flushing needed. This fixes a
SIGSEGV on shutdown */
+ return;
+ }
if (!SG(headers_sent)) {
sapi_send_headers(TSRMLS_C);
@@ -826,6 +831,7 @@
}
#endif
+ sapi_shutdown();
tsrm_shutdown();
log_error(LOG_INFORM, php5_close, NULL, NULL, Shutdown PHP Module);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/nsapi nsapi.c
thetaphiWed Feb 25 19:52:06 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/nsapi nsapi.c
Log:
Fix Bug 47495: Keep header in internal list after add, so headers_list()
works correctly. Other SAPIs have the same problem, but PHP 5.3 fixes this more
elegant.
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.16r2=1.69.2.3.2.17diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.16
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.17
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.16Tue Jan 6 13:46:49 2009
+++ php-src/sapi/nsapi/nsapi.c Wed Feb 25 19:52:06 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.16 2009/01/06 13:46:49 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.17 2009/02/25 19:52:06 thetaphi Exp $ */
/*
* PHP includes
@@ -294,7 +294,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.16 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.17 $);
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 );
@@ -473,7 +473,7 @@
char *header_name, *header_content, *p;
nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
- header_name = sapi_header-header;
+ header_name = nsapi_strdup(sapi_header-header);
header_content = p = strchr(header_name, ':');
if (p == NULL) {
efree(sapi_header-header);
@@ -497,9 +497,9 @@
pblock_nvinsert(header_name, header_content, rc-rq-srvhdrs);
}
- sapi_free_header(sapi_header);
+ nsapi_free(header_name);
- return 0; /* don't use the default SAPI mechanism, NSAPI
duplicates this functionality */
+ return SAPI_HEADER_ADD;
}
static int sapi_nsapi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
thetaphiSun Jan 11 13:39:01 2009 UTC
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
add sanity check for time_t size of win32
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.101r2=1.102diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.101 php-src/sapi/nsapi/nsapi.c:1.102
--- php-src/sapi/nsapi/nsapi.c:1.101Tue Jan 6 13:45:30 2009
+++ php-src/sapi/nsapi/nsapi.c Sun Jan 11 13:39:01 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.101 2009/01/06 13:45:30 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.102 2009/01/11 13:39:01 thetaphi Exp $ */
/*
* PHP includes
@@ -55,7 +55,14 @@
#define XP_UNIX
#endif
#endif
-
+
+/*
+ * For windows do some sanity checks, because time_t must be 32bit for NSAPI
on win32
+ */
+#if defined(PHP_WIN32) !defined(_WIN64) sizeof(time_t)!=4
+#error NSAPI module needs time_t to have a size of 32 bits on win32
+#endif
+
/*
* NSAPI includes
*/
@@ -307,7 +314,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.101
$);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.102
$);
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 );
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/nsapi nsapi.c
thetaphiSun Jan 11 13:39:39 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/nsapi nsapi.c
Log:
MFH: add sanity check for time_t size of win32
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.6.2.16r2=1.69.2.3.2.6.2.17diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.16
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.17
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.16Tue Jan 6 13:46:20 2009
+++ php-src/sapi/nsapi/nsapi.c Sun Jan 11 13:39:39 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.6.2.16 2009/01/06 13:46:20 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.6.2.17 2009/01/11 13:39:39 thetaphi Exp $ */
/*
* PHP includes
@@ -55,7 +55,14 @@
#define XP_UNIX
#endif
#endif
-
+
+/*
+ * For windows do some sanity checks, because time_t must be 32bit for NSAPI
on win32
+ */
+#if defined(PHP_WIN32) !defined(_WIN64) sizeof(time_t)!=4
+#error NSAPI module needs time_t to have a size of 32 bits on win32
+#endif
+
/*
* NSAPI includes
*/
@@ -307,7 +314,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.6.2.16 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.6.2.17 $);
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 );
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
thetaphiSun Jan 11 13:46:46 2009 UTC
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
revert last commit, sizeof does not work in preprocessor :(
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.102r2=1.103diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.102 php-src/sapi/nsapi/nsapi.c:1.103
--- php-src/sapi/nsapi/nsapi.c:1.102Sun Jan 11 13:39:01 2009
+++ php-src/sapi/nsapi/nsapi.c Sun Jan 11 13:46:45 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.102 2009/01/11 13:39:01 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.103 2009/01/11 13:46:45 thetaphi Exp $ */
/*
* PHP includes
@@ -57,13 +57,6 @@
#endif
/*
- * For windows do some sanity checks, because time_t must be 32bit for NSAPI
on win32
- */
-#if defined(PHP_WIN32) !defined(_WIN64) sizeof(time_t)!=4
-#error NSAPI module needs time_t to have a size of 32 bits on win32
-#endif
-
-/*
* NSAPI includes
*/
#include nsapi.h
@@ -314,7 +307,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.102
$);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.103
$);
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 );
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/nsapi nsapi.c
thetaphiSun Jan 11 13:47:01 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/nsapi nsapi.c
Log:
revert last commit, sizeof does not work in preprocessor :(
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.6.2.17r2=1.69.2.3.2.6.2.18diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.17
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.18
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.17Sun Jan 11 13:39:39 2009
+++ php-src/sapi/nsapi/nsapi.c Sun Jan 11 13:47:01 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.6.2.17 2009/01/11 13:39:39 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.6.2.18 2009/01/11 13:47:01 thetaphi Exp $ */
/*
* PHP includes
@@ -57,13 +57,6 @@
#endif
/*
- * For windows do some sanity checks, because time_t must be 32bit for NSAPI
on win32
- */
-#if defined(PHP_WIN32) !defined(_WIN64) sizeof(time_t)!=4
-#error NSAPI module needs time_t to have a size of 32 bits on win32
-#endif
-
-/*
* NSAPI includes
*/
#include nsapi.h
@@ -314,7 +307,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.6.2.17 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.6.2.18 $);
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 );
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
RE: [PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
Ys! I've seen this comment here: /* vs.net 2005 has a 64-bit time_t. This will likely break * 3rdParty libs that were built with older compilers; switch * back to 32-bit */ #ifndef _WIN64 # define _USE_32BIT_TIME_T 1 #endif If somebody wants to remove this he should be prepared to have failures in NSAPI :-) Thanks, Uwe - Uwe Schindler theta...@php.net - http://www.php.net NSAPI SAPI developer Bremen, Germany -Original Message- From: Pierre Joye [mailto:pierre@gmail.com] Sent: Sunday, January 11, 2009 2:41 PM To: Uwe Schindler Cc: php-cvs@lists.php.net Subject: Re: [PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c On Sun, Jan 11, 2009 at 2:39 PM, Uwe Schindler theta...@php.net wrote: thetaphiSun Jan 11 13:39:01 2009 UTC Modified files: /php-src/sapi/nsapi nsapi.c Log: add sanity check for time_t size of win32 http://cvs.php.net/viewvc.cgi/php- src/sapi/nsapi/nsapi.c?r1=1.101r2=1.102diff_format=u Index: php-src/sapi/nsapi/nsapi.c diff -u php-src/sapi/nsapi/nsapi.c:1.101 php- src/sapi/nsapi/nsapi.c:1.102 --- php-src/sapi/nsapi/nsapi.c:1.101Tue Jan 6 13:45:30 2009 +++ php-src/sapi/nsapi/nsapi.c Sun Jan 11 13:39:01 2009 @@ -17,7 +17,7 @@ + --+ */ -/* $Id: nsapi.c,v 1.101 2009/01/06 13:45:30 thetaphi Exp $ */ +/* $Id: nsapi.c,v 1.102 2009/01/11 13:39:01 thetaphi Exp $ */ /* * PHP includes @@ -55,7 +55,14 @@ #define XP_UNIX #endif #endif - + +/* + * For windows do some sanity checks, because time_t must be 32bit for NSAPI on win32 + */ +#if defined(PHP_WIN32) !defined(_WIN64) sizeof(time_t)!=4 +#error NSAPI module needs time_t to have a size of 32 bits on win32 +#endif We already do this check in the main configuration file, you may want to rely on it instead. -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
thetaphiTue Jan 6 13:45:30 2009 UTC
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
the #ifdef was never working. If Sun extends its NSAPI to support
subrequests, much of this code must be rewritten. Because of that it is better
to have a clean start. This commit does not change behaviour.
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.100r2=1.101diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.100 php-src/sapi/nsapi/nsapi.c:1.101
--- php-src/sapi/nsapi/nsapi.c:1.100Wed Dec 31 11:12:40 2008
+++ php-src/sapi/nsapi/nsapi.c Tue Jan 6 13:45:30 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.100 2008/12/31 11:12:40 sebastian Exp $ */
+/* $Id: nsapi.c,v 1.101 2009/01/06 13:45:30 thetaphi Exp $ */
/*
* PHP includes
@@ -238,13 +238,6 @@
*/
static void php_nsapi_init_dynamic_symbols(void)
{
-#if defined(servact_uri2path) defined(servact_pathchecks)
defined(servact_fileinfo) defined(servact_service)
- /* use functions from nsapi.h if available */
- nsapi_servact_uri2path = servact_uri2path;
- nsapi_servact_pathchecks = servact_pathchecks;
- nsapi_servact_fileinfo = servact_fileinfo;
- nsapi_servact_service = servact_service;
-#else
/* find address of internal NSAPI functions */
#ifdef PHP_WIN32
register int i;
@@ -278,7 +271,6 @@
nsapi_servact_fileinfo = NULL;
nsapi_servact_service = NULL;
}
-#endif
}
/* }}} */
@@ -315,7 +307,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.100
$);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.101
$);
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 );
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/nsapi nsapi.c
thetaphiTue Jan 6 13:46:20 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/nsapi nsapi.c
Log:
MFH: the #ifdef was never working. If Sun extends its NSAPI to support
subrequests, much of this code must be rewritten. Because of that it is better
to have a clean start. This commit does not change behaviour.
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.6.2.15r2=1.69.2.3.2.6.2.16diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.15
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.16
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.15Wed Dec 31 11:15:49 2008
+++ php-src/sapi/nsapi/nsapi.c Tue Jan 6 13:46:20 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.6.2.15 2008/12/31 11:15:49 sebastian Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.6.2.16 2009/01/06 13:46:20 thetaphi Exp $ */
/*
* PHP includes
@@ -238,13 +238,6 @@
*/
static void php_nsapi_init_dynamic_symbols(void)
{
-#if defined(servact_uri2path) defined(servact_pathchecks)
defined(servact_fileinfo) defined(servact_service)
- /* use functions from nsapi.h if available */
- nsapi_servact_uri2path = servact_uri2path;
- nsapi_servact_pathchecks = servact_pathchecks;
- nsapi_servact_fileinfo = servact_fileinfo;
- nsapi_servact_service = servact_service;
-#else
/* find address of internal NSAPI functions */
#ifdef PHP_WIN32
register int i;
@@ -278,7 +271,6 @@
nsapi_servact_fileinfo = NULL;
nsapi_servact_service = NULL;
}
-#endif
}
/* }}} */
@@ -315,7 +307,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.6.2.15 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.6.2.16 $);
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 );
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/nsapi nsapi.c
thetaphiTue Jan 6 13:46:49 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/nsapi nsapi.c
Log:
MFH: the #ifdef was never working. If Sun extends its NSAPI to support
subrequests, much of this code must be rewritten. Because of that it is better
to have a clean start. This commit does not change behaviour.
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.15r2=1.69.2.3.2.16diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.15
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.16
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.15Wed Dec 31 11:17:49 2008
+++ php-src/sapi/nsapi/nsapi.c Tue Jan 6 13:46:49 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.15 2008/12/31 11:17:49 sebastian Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.16 2009/01/06 13:46:49 thetaphi Exp $ */
/*
* PHP includes
@@ -225,13 +225,6 @@
*/
static void php_nsapi_init_dynamic_symbols(void)
{
-#if defined(servact_uri2path) defined(servact_pathchecks)
defined(servact_fileinfo) defined(servact_service)
- /* use functions from nsapi.h if available */
- nsapi_servact_uri2path = servact_uri2path;
- nsapi_servact_pathchecks = servact_pathchecks;
- nsapi_servact_fileinfo = servact_fileinfo;
- nsapi_servact_service = servact_service;
-#else
/* find address of internal NSAPI functions */
#ifdef PHP_WIN32
register int i;
@@ -265,7 +258,6 @@
nsapi_servact_fileinfo = NULL;
nsapi_servact_service = NULL;
}
-#endif
}
/* }}} */
@@ -302,7 +294,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.15 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.16 $);
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 );
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
thetaphiMon Dec 1 10:08:43 2008 UTC
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
remove unneeded includes (not needed since NSAPI 3.0, wich is very old). This
is needed for cleanup of the windows build.
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.98r2=1.99diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.98 php-src/sapi/nsapi/nsapi.c:1.99
--- php-src/sapi/nsapi/nsapi.c:1.98 Sat Nov 29 23:43:43 2008
+++ php-src/sapi/nsapi/nsapi.c Mon Dec 1 10:08:42 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.98 2008/11/29 23:43:43 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.99 2008/12/01 10:08:42 thetaphi Exp $ */
/*
* PHP includes
@@ -60,12 +60,6 @@
* NSAPI includes
*/
#include nsapi.h
-#include base/pblock.h
-#include base/session.h
-#include frame/req.h
-#include frame/protocol.h /* protocol_start_response */
-#include base/util.h /* is_mozilla, getline */
-#include frame/log.h /* log_error */
#define NSLS_D struct nsapi_request_context *request_context
#define NSLS_DC, NSLS_D
@@ -321,7 +315,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.98
$);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.99
$);
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 );
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/nsapi nsapi.c
thetaphiMon Dec 1 10:11:10 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/nsapi nsapi.c
Log:
remove unneeded includes (not needed since NSAPI 3.0, wich is very old). This
is needed for cleanup of the windows build.
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.6.2.13r2=1.69.2.3.2.6.2.14diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.13
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.14
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.13Sat Nov 29 23:44:08 2008
+++ php-src/sapi/nsapi/nsapi.c Mon Dec 1 10:11:09 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.6.2.13 2008/11/29 23:44:08 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.6.2.14 2008/12/01 10:11:09 thetaphi Exp $ */
/*
* PHP includes
@@ -60,12 +60,6 @@
* NSAPI includes
*/
#include nsapi.h
-#include base/pblock.h
-#include base/session.h
-#include frame/req.h
-#include frame/protocol.h /* protocol_start_response */
-#include base/util.h /* is_mozilla, getline */
-#include frame/log.h /* log_error */
#define NSLS_D struct nsapi_request_context *request_context
#define NSLS_DC, NSLS_D
@@ -321,7 +315,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.6.2.13 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.6.2.14 $);
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 );
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/nsapi nsapi.c
thetaphiMon Dec 1 10:11:57 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/nsapi nsapi.c
Log:
remove unneeded includes (not needed since NSAPI 3.0, wich is very old). This
is needed for cleanup of the windows build.
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.13r2=1.69.2.3.2.14diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.13
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.14
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.13Sat Nov 29 23:44:44 2008
+++ php-src/sapi/nsapi/nsapi.c Mon Dec 1 10:11:57 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.13 2008/11/29 23:44:44 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.14 2008/12/01 10:11:57 thetaphi Exp $ */
/*
* PHP includes
@@ -60,12 +60,6 @@
* NSAPI includes
*/
#include nsapi.h
-#include base/pblock.h
-#include base/session.h
-#include frame/req.h
-#include frame/protocol.h /* protocol_start_response */
-#include base/util.h /* is_mozilla, getline */
-#include frame/log.h /* log_error */
#define NSLS_D struct nsapi_request_context *request_context
#define NSLS_DC, NSLS_D
@@ -308,7 +302,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.13 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.14 $);
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 );
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
thetaphiSat Nov 29 14:44:27 2008 UTC
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
- Implement the changes needed for http://news.php.net/php.cvs/54228
- Additionally implement flushing in NSAPI and fix some small things
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.94r2=1.95diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.94 php-src/sapi/nsapi/nsapi.c:1.95
--- php-src/sapi/nsapi/nsapi.c:1.94 Mon Nov 17 11:26:25 2008
+++ php-src/sapi/nsapi/nsapi.c Sat Nov 29 14:44:26 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.94 2008/11/17 11:26:25 felipe Exp $ */
+/* $Id: nsapi.c,v 1.95 2008/11/29 14:44:26 thetaphi Exp $ */
/*
* PHP includes
@@ -321,7 +321,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.94
$);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.95
$);
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 );
@@ -444,8 +444,6 @@
array_init(return_value);
- php_header(TSRMLS_C);
-
for (i=0; i rc-rq-srvhdrs-hsize; i++) {
entry=rc-rq-srvhdrs-ht[i];
while (entry) {
@@ -464,9 +462,12 @@
static int sapi_nsapi_ub_write(const char *str, unsigned int str_length
TSRMLS_DC)
{
int retval;
- nsapi_request_context *rc;
+ nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
+
+ if (!SG(headers_sent)) {
+ sapi_send_headers(TSRMLS_C);
+ }
- rc = (nsapi_request_context *)SG(server_context);
retval = net_write(rc-sn-csd, (char *)str, str_length);
if (retval == IO_ERROR /* -1 */ || retval == IO_EOF /* 0 */) {
php_handle_aborted_connection();
@@ -474,38 +475,102 @@
return retval;
}
-static int sapi_nsapi_header_handler(sapi_header_struct *sapi_header,
sapi_headers_struct *sapi_headers TSRMLS_DC)
+/* modified version of apache2 */
+static void sapi_nsapi_flush(void *server_context)
{
- char *header_name, *header_content, *p;
- nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
+ nsapi_request_context *rc = (nsapi_request_context *)server_context;
+ TSRMLS_FETCH();
- header_name = sapi_header-header;
- header_content = p = strchr(header_name, ':');
- if (p == NULL) {
- efree(sapi_header-header);
- return 0;
+ if (!rc) {
+ return;
}
- *p = 0;
- do {
- header_content++;
- } while (*header_content == ' ');
+ if (!SG(headers_sent)) {
+ sapi_send_headers(TSRMLS_C);
+ }
- if (!strcasecmp(header_name, Content-Type)) {
- param_free(pblock_remove(content-type, rc-rq-srvhdrs));
- pblock_nvinsert(content-type, header_content,
rc-rq-srvhdrs);
- } else {
- /* to lower case because NSAPI reformats the headers and wants
lowercase */
- for (p=header_name; *p; p++) {
- *p=tolower(*p);
- }
- if (sapi_header-replace) param_free(pblock_remove(header_name,
rc-rq-srvhdrs));
- pblock_nvinsert(header_name, header_content, rc-rq-srvhdrs);
+ /* flushing is only supported in iPlanet servers from version 6.1 on,
make it conditional */
+#if defined(net_flush)
+ if (net_flush(rc-sn-csd) 0) {
+ php_handle_aborted_connection();
}
+#endif
+}
- sapi_free_header(sapi_header);
+/* callback for zend_llist_apply on SAPI_HEADER_DELETE_ALL operation */
+static int php_nsapi_remove_header(sapi_header_struct *sapi_header TSRMLS_DC)
+{
+ char *header_name, *p;
+ nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
+
+ /* copy the header, because NSAPI needs reformatting and we do not want
to change the parameter */
+ header_name = nsapi_strdup(sapi_header-header);
- return 0; /* don't use the default SAPI mechanism, NSAPI
duplicates this functionality */
+ /* extract name, this works, if only the header without ':' is given,
too */
+ if (p = strchr(header_name, ':')) {
+ *p = 0;
+ }
+
+ /* header_name to lower case because NSAPI reformats the headers and
wants lowercase */
+ for (p=header_name; *p; p++) {
+ *p=tolower(*p);
+ }
+
+ /* remove the header */
+
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/nsapi nsapi.c
thetaphiSat Nov 29 14:45:51 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/nsapi nsapi.c
Log:
MFH:
- Implement the changes needed for http://news.php.net/php.cvs/54228
- Additionally implement flushing in NSAPI and fix some small things
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.6.2.9r2=1.69.2.3.2.6.2.10diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.9
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.10
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.9 Mon Nov 17 11:28:01 2008
+++ php-src/sapi/nsapi/nsapi.c Sat Nov 29 14:45:51 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.6.2.9 2008/11/17 11:28:01 felipe Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.6.2.10 2008/11/29 14:45:51 thetaphi Exp $ */
/*
* PHP includes
@@ -321,7 +321,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.6.2.9 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.6.2.10 $);
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 );
@@ -446,8 +446,6 @@
array_init(return_value);
- php_header(TSRMLS_C);
-
for (i=0; i rc-rq-srvhdrs-hsize; i++) {
entry=rc-rq-srvhdrs-ht[i];
while (entry) {
@@ -466,9 +464,12 @@
static int sapi_nsapi_ub_write(const char *str, unsigned int str_length
TSRMLS_DC)
{
int retval;
- nsapi_request_context *rc;
+ nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
+
+ if (!SG(headers_sent)) {
+ sapi_send_headers(TSRMLS_C);
+ }
- rc = (nsapi_request_context *)SG(server_context);
retval = net_write(rc-sn-csd, (char *)str, str_length);
if (retval == IO_ERROR /* -1 */ || retval == IO_EOF /* 0 */) {
php_handle_aborted_connection();
@@ -476,38 +477,102 @@
return retval;
}
-static int sapi_nsapi_header_handler(sapi_header_struct *sapi_header,
sapi_headers_struct *sapi_headers TSRMLS_DC)
+/* modified version of apache2 */
+static void sapi_nsapi_flush(void *server_context)
{
- char *header_name, *header_content, *p;
- nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
+ nsapi_request_context *rc = (nsapi_request_context *)server_context;
+ TSRMLS_FETCH();
- header_name = sapi_header-header;
- header_content = p = strchr(header_name, ':');
- if (p == NULL) {
- efree(sapi_header-header);
- return 0;
+ if (!rc) {
+ return;
}
- *p = 0;
- do {
- header_content++;
- } while (*header_content == ' ');
+ if (!SG(headers_sent)) {
+ sapi_send_headers(TSRMLS_C);
+ }
- if (!strcasecmp(header_name, Content-Type)) {
- param_free(pblock_remove(content-type, rc-rq-srvhdrs));
- pblock_nvinsert(content-type, header_content,
rc-rq-srvhdrs);
- } else {
- /* to lower case because NSAPI reformats the headers and wants
lowercase */
- for (p=header_name; *p; p++) {
- *p=tolower(*p);
- }
- if (sapi_header-replace) param_free(pblock_remove(header_name,
rc-rq-srvhdrs));
- pblock_nvinsert(header_name, header_content, rc-rq-srvhdrs);
+ /* flushing is only supported in iPlanet servers from version 6.1 on,
make it conditional */
+#if defined(net_flush)
+ if (net_flush(rc-sn-csd) 0) {
+ php_handle_aborted_connection();
}
+#endif
+}
- sapi_free_header(sapi_header);
+/* callback for zend_llist_apply on SAPI_HEADER_DELETE_ALL operation */
+static int php_nsapi_remove_header(sapi_header_struct *sapi_header TSRMLS_DC)
+{
+ char *header_name, *p;
+ nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
+
+ /* copy the header, because NSAPI needs reformatting and we do not want
to change the parameter */
+ header_name = nsapi_strdup(sapi_header-header);
- return 0; /* don't use the default SAPI mechanism, NSAPI
duplicates this functionality */
+ /* extract name, this works, if only the header without ':' is given,
too */
+ if (p = strchr(header_name, ':')) {
+ *p = 0;
+ }
+
+ /* header_name to lower case because NSAPI reformats the headers and
wants lowercase */
+ for
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/nsapi nsapi.c
thetaphiSat Nov 29 14:51:45 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/nsapi nsapi.c
Log:
Hallo release manager: This patch is not release critical (affects only
NSAPI, but I want it to be fixed in the last version of PHP 5.2). If you do not
want to have it in, revert it, a new RC is definitely not needed because of
this (and I am sure nobody who tests RCs is using NSAPI :)!
MFH: Implement flushing in NSAPI, fix some problems with output buffering if
the response was not started (no headers sent) before doing something in
ub_write() or flush() - Writing or flushing output will fail in NSAPI, if
headers were not sent before.
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.9r2=1.69.2.3.2.10diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.9
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.10
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.9 Sun Jun 22 18:10:33 2008
+++ php-src/sapi/nsapi/nsapi.c Sat Nov 29 14:51:45 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.9 2008/06/22 18:10:33 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.10 2008/11/29 14:51:45 thetaphi Exp $ */
/*
* PHP includes
@@ -308,7 +308,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.9 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.10 $);
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 );
@@ -433,8 +433,6 @@
array_init(return_value);
- php_header(TSRMLS_C);
-
for (i=0; i rc-rq-srvhdrs-hsize; i++) {
entry=rc-rq-srvhdrs-ht[i];
while (entry) {
@@ -453,9 +451,12 @@
static int sapi_nsapi_ub_write(const char *str, unsigned int str_length
TSRMLS_DC)
{
int retval;
- nsapi_request_context *rc;
+ nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
+
+ if (!SG(headers_sent)) {
+ sapi_send_headers(TSRMLS_C);
+ }
- rc = (nsapi_request_context *)SG(server_context);
retval = net_write(rc-sn-csd, (char *)str, str_length);
if (retval == IO_ERROR /* -1 */ || retval == IO_EOF /* 0 */) {
php_handle_aborted_connection();
@@ -463,6 +464,28 @@
return retval;
}
+/* modified version of apache2 */
+static void sapi_nsapi_flush(void *server_context)
+{
+ nsapi_request_context *rc = (nsapi_request_context *)server_context;
+ TSRMLS_FETCH();
+
+ if (!rc) {
+ return;
+ }
+
+ if (!SG(headers_sent)) {
+ sapi_send_headers(TSRMLS_C);
+ }
+
+ /* flushing is only supported in iPlanet servers from version 6.1 on,
make it conditional */
+#if defined(net_flush)
+ if (net_flush(rc-sn-csd) 0) {
+ php_handle_aborted_connection();
+ }
+#endif
+}
+
static int sapi_nsapi_header_handler(sapi_header_struct *sapi_header,
sapi_headers_struct *sapi_headers TSRMLS_DC)
{
char *header_name, *header_content, *p;
@@ -747,7 +770,7 @@
NULL, /* deactivate */
sapi_nsapi_ub_write,/* unbuffered write */
- NULL, /* flush */
+ sapi_nsapi_flush, /* flush */
NULL, /* get uid */
NULL, /* getenv */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
thetaphiSat Nov 29 19:36:41 2008 UTC
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
remove one stat call and replace by cached one
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.95r2=1.96diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.95 php-src/sapi/nsapi/nsapi.c:1.96
--- php-src/sapi/nsapi/nsapi.c:1.95 Sat Nov 29 14:44:26 2008
+++ php-src/sapi/nsapi/nsapi.c Sat Nov 29 19:36:40 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.95 2008/11/29 14:44:26 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.96 2008/11/29 19:36:40 thetaphi Exp $ */
/*
* PHP includes
@@ -321,7 +321,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.95
$);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.96
$);
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 );
@@ -481,10 +481,6 @@
nsapi_request_context *rc = (nsapi_request_context *)server_context;
TSRMLS_FETCH();
- if (!rc) {
- return;
- }
-
if (!SG(headers_sent)) {
sapi_send_headers(TSRMLS_C);
}
@@ -965,7 +961,7 @@
int retval;
nsapi_request_context *request_context;
zend_file_handle file_handle = {0};
- struct stat fst;
+ struct stat *fst;
char *path_info;
char *query_string= pblock_findval(query, rq-reqpb);
@@ -1037,7 +1033,8 @@
file_handle.free_filename = 0;
file_handle.opened_path = NULL;
- if (stat(SG(request_info).path_translated, fst)==0
S_ISREG(fst.st_mode)) {
+ fst = request_stat_path(SG(request_info).path_translated, rq);
+ if (fst S_ISREG(fst-st_mode)) {
if (php_request_startup(TSRMLS_C) == SUCCESS) {
php_execute_script(file_handle TSRMLS_CC);
php_request_shutdown(NULL);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/nsapi nsapi.c
thetaphiSat Nov 29 19:37:06 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/nsapi nsapi.c
Log:
MFH: remove one stat call and replace by cached one
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.6.2.10r2=1.69.2.3.2.6.2.11diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.10
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.11
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.10Sat Nov 29 14:45:51 2008
+++ php-src/sapi/nsapi/nsapi.c Sat Nov 29 19:37:06 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.6.2.10 2008/11/29 14:45:51 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.6.2.11 2008/11/29 19:37:06 thetaphi Exp $ */
/*
* PHP includes
@@ -321,7 +321,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.6.2.10 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.6.2.11 $);
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 );
@@ -483,10 +483,6 @@
nsapi_request_context *rc = (nsapi_request_context *)server_context;
TSRMLS_FETCH();
- if (!rc) {
- return;
- }
-
if (!SG(headers_sent)) {
sapi_send_headers(TSRMLS_C);
}
@@ -969,7 +965,7 @@
int retval;
nsapi_request_context *request_context;
zend_file_handle file_handle = {0};
- struct stat fst;
+ struct stat *fst;
char *path_info;
char *query_string= pblock_findval(query, rq-reqpb);
@@ -1041,7 +1037,8 @@
file_handle.free_filename = 0;
file_handle.opened_path = NULL;
- if (stat(SG(request_info).path_translated, fst)==0
S_ISREG(fst.st_mode)) {
+ fst = request_stat_path(SG(request_info).path_translated, rq);
+ if (fst S_ISREG(fst-st_mode)) {
if (php_request_startup(TSRMLS_C) == SUCCESS) {
php_execute_script(file_handle TSRMLS_CC);
php_request_shutdown(NULL);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/nsapi nsapi.c
thetaphiSat Nov 29 19:38:04 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/nsapi nsapi.c
Log:
MFH: remove one stat call and replace by cached one
(release-manager: the same like with last commit)
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.10r2=1.69.2.3.2.11diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.10
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.11
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.10Sat Nov 29 14:51:45 2008
+++ php-src/sapi/nsapi/nsapi.c Sat Nov 29 19:38:04 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.10 2008/11/29 14:51:45 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.11 2008/11/29 19:38:04 thetaphi Exp $ */
/*
* PHP includes
@@ -308,7 +308,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.10 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.11 $);
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 );
@@ -470,10 +470,6 @@
nsapi_request_context *rc = (nsapi_request_context *)server_context;
TSRMLS_FETCH();
- if (!rc) {
- return;
- }
-
if (!SG(headers_sent)) {
sapi_send_headers(TSRMLS_C);
}
@@ -913,7 +909,7 @@
int retval;
nsapi_request_context *request_context;
zend_file_handle file_handle = {0};
- struct stat fst;
+ struct stat *fst;
char *path_info;
char *query_string= pblock_findval(query, rq-reqpb);
@@ -985,7 +981,8 @@
file_handle.free_filename = 0;
file_handle.opened_path = NULL;
- if (stat(SG(request_info).path_translated, fst)==0
S_ISREG(fst.st_mode)) {
+ fst = request_stat_path(SG(request_info).path_translated, rq);
+ if (fst S_ISREG(fst-st_mode)) {
if (php_request_startup(TSRMLS_C) == SUCCESS) {
php_execute_script(file_handle TSRMLS_CC);
php_request_shutdown(NULL);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
thetaphiSat Nov 29 19:57:23 2008 UTC
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
Some nsapi.h specific ifdefs unified corrected
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.96r2=1.97diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.96 php-src/sapi/nsapi/nsapi.c:1.97
--- php-src/sapi/nsapi/nsapi.c:1.96 Sat Nov 29 19:36:40 2008
+++ php-src/sapi/nsapi/nsapi.c Sat Nov 29 19:57:23 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.96 2008/11/29 19:36:40 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.97 2008/11/29 19:57:23 thetaphi Exp $ */
/*
* PHP includes
@@ -321,7 +321,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.96
$);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.97
$);
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 );
@@ -486,7 +486,7 @@
}
/* flushing is only supported in iPlanet servers from version 6.1 on,
make it conditional */
-#if defined(net_flush)
+#if NSAPI_VERSION = 302
if (net_flush(rc-sn-csd) 0) {
php_handle_aborted_connection();
}
@@ -908,12 +908,10 @@
int threads=128; /* default for server */
/* fetch max threads from NSAPI and initialize TSRM with it */
-#if defined(pool_maxthreads)
- threads=pool_maxthreads;
+ threads=conf_getglobals()-Vpool_maxthreads;
if (threads1) {
threads=128; /* default for server */
}
-#endif
tsrm_startup(threads, 1, 0, NULL);
core_globals = ts_resource(core_globals_id);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/nsapi nsapi.c
thetaphiSat Nov 29 19:57:49 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/nsapi nsapi.c
Log:
MFH: Some nsapi.h specific ifdefs unified corrected
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.6.2.11r2=1.69.2.3.2.6.2.12diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.11
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.12
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.11Sat Nov 29 19:37:06 2008
+++ php-src/sapi/nsapi/nsapi.c Sat Nov 29 19:57:49 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.6.2.11 2008/11/29 19:37:06 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.6.2.12 2008/11/29 19:57:49 thetaphi Exp $ */
/*
* PHP includes
@@ -321,7 +321,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.6.2.11 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.6.2.12 $);
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 );
@@ -488,7 +488,7 @@
}
/* flushing is only supported in iPlanet servers from version 6.1 on,
make it conditional */
-#if defined(net_flush)
+#if NSAPI_VERSION = 302
if (net_flush(rc-sn-csd) 0) {
php_handle_aborted_connection();
}
@@ -912,12 +912,10 @@
int threads=128; /* default for server */
/* fetch max threads from NSAPI and initialize TSRM with it */
-#if defined(pool_maxthreads)
- threads=pool_maxthreads;
+ threads=conf_getglobals()-Vpool_maxthreads;
if (threads1) {
threads=128; /* default for server */
}
-#endif
tsrm_startup(threads, 1, 0, NULL);
core_globals = ts_resource(core_globals_id);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/nsapi nsapi.c
thetaphiSat Nov 29 19:59:27 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/nsapi nsapi.c
Log:
MFH: Some nsapi.h specific ifdefs unified corrected (same like last commit,
only cleanup)
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.11r2=1.69.2.3.2.12diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.11
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.12
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.11Sat Nov 29 19:38:04 2008
+++ php-src/sapi/nsapi/nsapi.c Sat Nov 29 19:59:27 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.11 2008/11/29 19:38:04 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.12 2008/11/29 19:59:27 thetaphi Exp $ */
/*
* PHP includes
@@ -308,7 +308,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.11 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.12 $);
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 );
@@ -475,7 +475,7 @@
}
/* flushing is only supported in iPlanet servers from version 6.1 on,
make it conditional */
-#if defined(net_flush)
+#if NSAPI_VERSION = 302
if (net_flush(rc-sn-csd) 0) {
php_handle_aborted_connection();
}
@@ -856,12 +856,10 @@
int threads=128; /* default for server */
/* fetch max threads from NSAPI and initialize TSRM with it */
-#if defined(pool_maxthreads)
- threads=pool_maxthreads;
+ threads=conf_getglobals()-Vpool_maxthreads;
if (threads1) {
threads=128; /* default for server */
}
-#endif
tsrm_startup(threads, 1, 0, NULL);
core_globals = ts_resource(core_globals_id);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
thetaphiSat Nov 29 23:43:43 2008 UTC
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
support stat cache of webserver (like apache does)
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.97r2=1.98diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.97 php-src/sapi/nsapi/nsapi.c:1.98
--- php-src/sapi/nsapi/nsapi.c:1.97 Sat Nov 29 19:57:23 2008
+++ php-src/sapi/nsapi/nsapi.c Sat Nov 29 23:43:43 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.97 2008/11/29 19:57:23 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.98 2008/11/29 23:43:43 thetaphi Exp $ */
/*
* PHP includes
@@ -321,7 +321,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.97
$);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.98
$);
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 );
@@ -805,6 +805,13 @@
return SUCCESS;
}
+static struct stat* sapi_nsapi_get_stat(TSRMLS_D)
+{
+ return request_stat_path(
+ SG(request_info).path_translated,
+ ((nsapi_request_context *)SG(server_context))-rq
+ );
+}
static sapi_module_struct nsapi_sapi_module = {
nsapi,/* name */
@@ -818,7 +825,7 @@
sapi_nsapi_ub_write,/* unbuffered write */
sapi_nsapi_flush, /* flush */
- NULL, /* get uid */
+ sapi_nsapi_get_stat,/* get uid/stat */
NULL, /* getenv */
php_error, /* error handler */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/nsapi nsapi.c
thetaphiSat Nov 29 23:44:09 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/nsapi nsapi.c
Log:
MFH: support stat cache of webserver (like apache does)
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.6.2.12r2=1.69.2.3.2.6.2.13diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.12
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.13
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.12Sat Nov 29 19:57:49 2008
+++ php-src/sapi/nsapi/nsapi.c Sat Nov 29 23:44:08 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.6.2.12 2008/11/29 19:57:49 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.6.2.13 2008/11/29 23:44:08 thetaphi Exp $ */
/*
* PHP includes
@@ -321,7 +321,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.6.2.12 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.6.2.13 $);
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 );
@@ -809,6 +809,13 @@
return SUCCESS;
}
+static struct stat* sapi_nsapi_get_stat(TSRMLS_D)
+{
+ return request_stat_path(
+ SG(request_info).path_translated,
+ ((nsapi_request_context *)SG(server_context))-rq
+ );
+}
static sapi_module_struct nsapi_sapi_module = {
nsapi,/* name */
@@ -822,7 +829,7 @@
sapi_nsapi_ub_write,/* unbuffered write */
sapi_nsapi_flush, /* flush */
- NULL, /* get uid */
+ sapi_nsapi_get_stat,/* get uid/stat */
NULL, /* getenv */
php_error, /* error handler */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/nsapi nsapi.c
thetaphiSat Nov 29 23:44:44 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/nsapi nsapi.c
Log:
MFH: support stat cache of webserver (like apache does)
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.12r2=1.69.2.3.2.13diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.12
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.13
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.12Sat Nov 29 19:59:27 2008
+++ php-src/sapi/nsapi/nsapi.c Sat Nov 29 23:44:44 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.12 2008/11/29 19:59:27 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.13 2008/11/29 23:44:44 thetaphi Exp $ */
/*
* PHP includes
@@ -308,7 +308,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.12 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.13 $);
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 );
@@ -754,6 +754,13 @@
return SUCCESS;
}
+static struct stat* sapi_nsapi_get_stat(TSRMLS_D)
+{
+ return request_stat_path(
+ SG(request_info).path_translated,
+ ((nsapi_request_context *)SG(server_context))-rq
+ );
+}
static sapi_module_struct nsapi_sapi_module = {
nsapi,/* name */
@@ -767,7 +774,7 @@
sapi_nsapi_ub_write,/* unbuffered write */
sapi_nsapi_flush, /* flush */
- NULL, /* get uid */
+ sapi_nsapi_get_stat,/* get uid/stat */
NULL, /* getenv */
php_error, /* error handler */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
thetaphiSun Jun 22 18:08:45 2008 UTC
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
Response to: [PHP-DEV] cleaning up the functions - any volunteers? :)
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.87r2=1.88diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.87 php-src/sapi/nsapi/nsapi.c:1.88
--- php-src/sapi/nsapi/nsapi.c:1.87 Wed Mar 19 16:37:49 2008
+++ php-src/sapi/nsapi/nsapi.c Sun Jun 22 18:08:45 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.87 2008/03/19 16:37:49 rasmus Exp $ */
+/* $Id: nsapi.c,v 1.88 2008/06/22 18:08:45 thetaphi Exp $ */
/*
* PHP includes
@@ -308,7 +308,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.87
$);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.88
$);
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 );
@@ -327,31 +327,29 @@
*/
PHP_FUNCTION(nsapi_virtual)
{
- zval **uri;
- int rv;
- char *value;
+ int uri_len,rv;
+ char *uri,*value;
Request *rq;
nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, uri) == FAILURE)
{
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, uri,
uri_len) == FAILURE) {
+ return;
}
- convert_to_string_ex(uri);
if (!nsapi_servact_service) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to include
uri '%s' - Sub-requests not supported on this platform, (*uri)-value.str.val);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to include
uri '%s' - Sub-requests not supported on this platform, uri);
RETURN_FALSE;
} else if (zend_ini_long(zlib.output_compression,
sizeof(zlib.output_compression), 0)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to include
uri '%s' - Sub-requests do not work with zlib.output_compression,
(*uri)-value.str.val);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to include
uri '%s' - Sub-requests do not work with zlib.output_compression, uri);
RETURN_FALSE;
} else {
- php_output_end_all(TSRMLS_C);
+ php_end_ob_buffers(1 TSRMLS_CC);
php_header(TSRMLS_C);
/* do the sub-request */
/* thanks to Chris Elving from Sun for this code sniplet */
- if ((rq = request_restart_internal((*uri)-value.str.val,
NULL)) == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to
include uri '%s' - Internal request creation failed, (*uri)-value.str.val);
+ if ((rq = request_restart_internal(uri, NULL)) == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to
include uri '%s' - Internal request creation failed, uri);
RETURN_FALSE;
}
@@ -383,7 +381,7 @@
} while (rv == REQ_RESTART);
if (rq-status_num != 200) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to
include uri '%s' - HTTP status code %d during subrequest,
(*uri)-value.str.val, rq-status_num);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to
include uri '%s' - HTTP status code %d during subrequest, uri, rq-status_num);
request_free(rq);
RETURN_FALSE;
}
@@ -403,6 +401,10 @@
struct pb_entry *entry;
nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
+
array_init(return_value);
for (i=0; i rc-rq-headers-hsize; i++) {
@@ -423,6 +425,10 @@
struct pb_entry *entry;
nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
+
array_init(return_value);
php_header(TSRMLS_C);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/nsapi nsapi.c
thetaphiSun Jun 22 18:09:41 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/nsapi nsapi.c
Log:
MFH: Response to: [PHP-DEV] cleaning up the functions - any volunteers? :)
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.6.2.4r2=1.69.2.3.2.6.2.5diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.4
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.5
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.4 Tue Mar 18 22:23:21 2008
+++ php-src/sapi/nsapi/nsapi.c Sun Jun 22 18:09:41 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.6.2.4 2008/03/18 22:23:21 rasmus Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.6.2.5 2008/06/22 18:09:41 thetaphi Exp $ */
/*
* PHP includes
@@ -308,7 +308,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.6.2.4 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.6.2.5 $);
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 );
@@ -327,22 +327,20 @@
*/
PHP_FUNCTION(nsapi_virtual)
{
- zval **uri;
- int rv;
- char *value;
+ int uri_len,rv;
+ char *uri,*value;
Request *rq;
nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, uri) == FAILURE)
{
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, uri,
uri_len) == FAILURE) {
+ return;
}
- convert_to_string_ex(uri);
if (!nsapi_servact_service) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to include
uri '%s' - Sub-requests not supported on this platform, (*uri)-value.str.val);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to include
uri '%s' - Sub-requests not supported on this platform, uri);
RETURN_FALSE;
} else if (zend_ini_long(zlib.output_compression,
sizeof(zlib.output_compression), 0)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to include
uri '%s' - Sub-requests do not work with zlib.output_compression,
(*uri)-value.str.val);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to include
uri '%s' - Sub-requests do not work with zlib.output_compression, uri);
RETURN_FALSE;
} else {
php_end_ob_buffers(1 TSRMLS_CC);
@@ -350,8 +348,8 @@
/* do the sub-request */
/* thanks to Chris Elving from Sun for this code sniplet */
- if ((rq = request_restart_internal((*uri)-value.str.val,
NULL)) == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to
include uri '%s' - Internal request creation failed, (*uri)-value.str.val);
+ if ((rq = request_restart_internal(uri, NULL)) == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to
include uri '%s' - Internal request creation failed, uri);
RETURN_FALSE;
}
@@ -383,7 +381,7 @@
} while (rv == REQ_RESTART);
if (rq-status_num != 200) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to
include uri '%s' - HTTP status code %d during subrequest,
(*uri)-value.str.val, rq-status_num);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to
include uri '%s' - HTTP status code %d during subrequest, uri, rq-status_num);
request_free(rq);
RETURN_FALSE;
}
@@ -403,6 +401,10 @@
struct pb_entry *entry;
nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
+
array_init(return_value);
for (i=0; i rc-rq-headers-hsize; i++) {
@@ -425,6 +427,10 @@
struct pb_entry *entry;
nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
+
array_init(return_value);
php_header(TSRMLS_C);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/nsapi nsapi.c
thetaphiSun Jun 22 18:10:33 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/nsapi nsapi.c
Log:
MFH: Response to: [PHP-DEV] cleaning up the functions - any volunteers? :)
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.8r2=1.69.2.3.2.9diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.8
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.9
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.8 Sun Mar 9 16:06:33 2008
+++ php-src/sapi/nsapi/nsapi.c Sun Jun 22 18:10:33 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.8 2008/03/09 16:06:33 felipe Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.9 2008/06/22 18:10:33 thetaphi Exp $ */
/*
* PHP includes
@@ -308,7 +308,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.8 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.9 $);
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 );
@@ -327,22 +327,20 @@
*/
PHP_FUNCTION(nsapi_virtual)
{
- zval **uri;
- int rv;
- char *value;
+ int uri_len,rv;
+ char *uri,*value;
Request *rq;
nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, uri) == FAILURE)
{
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, uri,
uri_len) == FAILURE) {
+ return;
}
- convert_to_string_ex(uri);
if (!nsapi_servact_service) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to include
uri '%s' - Sub-requests not supported on this platform, (*uri)-value.str.val);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to include
uri '%s' - Sub-requests not supported on this platform, uri);
RETURN_FALSE;
} else if (zend_ini_long(zlib.output_compression,
sizeof(zlib.output_compression), 0)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to include
uri '%s' - Sub-requests do not work with zlib.output_compression,
(*uri)-value.str.val);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to include
uri '%s' - Sub-requests do not work with zlib.output_compression, uri);
RETURN_FALSE;
} else {
php_end_ob_buffers(1 TSRMLS_CC);
@@ -350,8 +348,8 @@
/* do the sub-request */
/* thanks to Chris Elving from Sun for this code sniplet */
- if ((rq = request_restart_internal((*uri)-value.str.val,
NULL)) == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to
include uri '%s' - Internal request creation failed, (*uri)-value.str.val);
+ if ((rq = request_restart_internal(uri, NULL)) == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to
include uri '%s' - Internal request creation failed, uri);
RETURN_FALSE;
}
@@ -383,7 +381,7 @@
} while (rv == REQ_RESTART);
if (rq-status_num != 200) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to
include uri '%s' - HTTP status code %d during subrequest,
(*uri)-value.str.val, rq-status_num);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to
include uri '%s' - HTTP status code %d during subrequest, uri, rq-status_num);
request_free(rq);
RETURN_FALSE;
}
@@ -403,6 +401,10 @@
struct pb_entry *entry;
nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
+ if (ZEND_NUM_ARGS()) {
+ WRONG_PARAM_COUNT;
+ }
+
array_init(return_value);
for (i=0; i rc-rq-headers-hsize; i++) {
@@ -425,6 +427,10 @@
struct pb_entry *entry;
nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
+ if (ZEND_NUM_ARGS()) {
+ WRONG_PARAM_COUNT;
+ }
+
array_init(return_value);
php_header(TSRMLS_C);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
thetaphiSun Jun 22 22:16:41 2008 UTC
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
URI should be UTF-8
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.88r2=1.89diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.88 php-src/sapi/nsapi/nsapi.c:1.89
--- php-src/sapi/nsapi/nsapi.c:1.88 Sun Jun 22 18:08:45 2008
+++ php-src/sapi/nsapi/nsapi.c Sun Jun 22 22:16:41 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.88 2008/06/22 18:08:45 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.89 2008/06/22 22:16:41 thetaphi Exp $ */
/*
* PHP includes
@@ -308,7 +308,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.88
$);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.89
$);
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 );
@@ -332,7 +332,7 @@
Request *rq;
nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, uri,
uri_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, uri,
uri_len, UG(utf8_conv)) == FAILURE) {
return;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
thetaphiSun Jun 22 22:28:31 2008 UTC
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
fix flushing for PHP6 output code
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.89r2=1.90diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.89 php-src/sapi/nsapi/nsapi.c:1.90
--- php-src/sapi/nsapi/nsapi.c:1.89 Sun Jun 22 22:16:41 2008
+++ php-src/sapi/nsapi/nsapi.c Sun Jun 22 22:28:31 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.89 2008/06/22 22:16:41 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.90 2008/06/22 22:28:31 thetaphi Exp $ */
/*
* PHP includes
@@ -308,7 +308,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.89
$);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.90
$);
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 );
@@ -343,7 +343,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to include
uri '%s' - Sub-requests do not work with zlib.output_compression, uri);
RETURN_FALSE;
} else {
- php_end_ob_buffers(1 TSRMLS_CC);
+ php_output_end_all(TSRMLS_C);
php_header(TSRMLS_C);
/* do the sub-request */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
thetaphiFri Apr 27 00:29:02 2007 UTC
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
Fix crash on server startup when log message is printed
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.82r2=1.83diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.82 php-src/sapi/nsapi/nsapi.c:1.83
--- php-src/sapi/nsapi/nsapi.c:1.82 Tue Mar 6 19:47:12 2007
+++ php-src/sapi/nsapi/nsapi.c Fri Apr 27 00:29:02 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.82 2007/03/06 19:47:12 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.83 2007/04/27 00:29:02 thetaphi Exp $ */
/*
* PHP includes
@@ -308,7 +308,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.82
$);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.83
$);
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 );
@@ -705,7 +705,11 @@
TSRMLS_FETCH();
nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
- log_error(LOG_INFORM, pblock_findval(fn, rc-pb), rc-sn, rc-rq,
%s, message);
+ if (rc) {
+ log_error(LOG_INFORM, pblock_findval(fn, rc-pb), rc-sn,
rc-rq, %s, message);
+ } else {
+ log_error(LOG_INFORM, php6, NULL, NULL, %s, message);
+ }
}
static time_t sapi_nsapi_get_request_time(TSRMLS_D)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/nsapi nsapi.c
thetaphiFri Apr 27 00:29:26 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/nsapi nsapi.c
Log:
MFH: Fix crash on server startup when log message is printed
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.5r2=1.69.2.3.2.6diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.5
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.5 Tue Mar 6 18:15:25 2007
+++ php-src/sapi/nsapi/nsapi.c Fri Apr 27 00:29:26 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.5 2007/03/06 18:15:25 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.6 2007/04/27 00:29:26 thetaphi Exp $ */
/*
* PHP includes
@@ -308,7 +308,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.5 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.6 $);
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 );
@@ -709,7 +709,11 @@
TSRMLS_FETCH();
nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
- log_error(LOG_INFORM, pblock_findval(fn, rc-pb), rc-sn, rc-rq,
%s, message);
+ if (rc) {
+ log_error(LOG_INFORM, pblock_findval(fn, rc-pb), rc-sn,
rc-rq, %s, message);
+ } else {
+ log_error(LOG_INFORM, php5, NULL, NULL, %s, message);
+ }
}
static time_t sapi_nsapi_get_request_time(TSRMLS_D)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/nsapi nsapi.c
thetaphiTue Mar 6 15:43:49 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/nsapi nsapi.c
Log:
use slprintf instead of snprintf and remove 0termination things (because
slprintf is always available now)
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.3r2=1.69.2.3.2.4diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.3
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.4
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.3 Mon Mar 5 16:29:18 2007
+++ php-src/sapi/nsapi/nsapi.c Tue Mar 6 15:43:49 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.3 2007/03/05 16:29:18 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.4 2007/03/06 15:43:49 thetaphi Exp $ */
/*
* PHP includes
@@ -73,8 +73,6 @@
#define NSLS_CC, NSLS_C
#define NSG(v) (request_context-v)
-#define NS_BUF_SIZE 2048
-
/*
* ZTS needs to be defined for NSAPI to work
*/
@@ -310,7 +308,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.3 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.4 $);
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 );
@@ -589,7 +587,7 @@
register size_t i;
int pos;
char *value,*p;
- char buf[NS_BUF_SIZE + 1];
+ char buf[2048];
struct pb_entry *entry;
for (i = 0; i nsapi_reqpb_size; i++) {
@@ -604,13 +602,12 @@
while (entry) {
if (!PG(safe_mode) || strncasecmp(entry-param-name,
authorization, 13)) {
if (strcasecmp(entry-param-name,
content-length)==0 || strcasecmp(entry-param-name, content-type)==0) {
- strlcpy(buf, entry-param-name,
NS_BUF_SIZE);
+ strlcpy(buf, entry-param-name,
sizeof(buf));
pos = 0;
} else {
- snprintf(buf, NS_BUF_SIZE, HTTP_%s,
entry-param-name);
+ slprintf(buf, sizeof(buf), HTTP_%s,
entry-param-name);
pos = 5;
}
- buf[NS_BUF_SIZE]='\0';
for(p = buf + pos; *p; p++) {
*p = toupper(*p);
if (*p 'A' || *p 'Z') {
@@ -642,7 +639,7 @@
nsapi_free(value);
}
- snprintf(buf, NS_BUF_SIZE, %d, conf_getglobals()-Vport);
+ slprintf(buf, sizeof(buf), %d, conf_getglobals()-Vport);
php_register_variable(SERVER_PORT, buf, track_vars_array TSRMLS_CC);
php_register_variable(SERVER_NAME,
conf_getglobals()-Vserver_hostname, track_vars_array TSRMLS_CC);
@@ -672,18 +669,17 @@
/* Create full Request-URI Script-Name */
if (SG(request_info).request_uri) {
- strlcpy(buf, SG(request_info).request_uri, NS_BUF_SIZE);
if (SG(request_info).query_string) {
- p = strchr(buf, 0);
- snprintf(p, NS_BUF_SIZE-(p-buf), ?%s,
SG(request_info).query_string);
- buf[NS_BUF_SIZE]='\0';
+ slprintf(buf, sizeof(buf), %s?%s,
SG(request_info).request_uri, SG(request_info).query_string);
+ } else {
+ strlcpy(buf, SG(request_info).request_uri, sizeof(buf));
}
php_register_variable(REQUEST_URI, buf, track_vars_array
TSRMLS_CC);
- strlcpy(buf, SG(request_info).request_uri, NS_BUF_SIZE);
+ strlcpy(buf, SG(request_info).request_uri, sizeof(buf));
if (rc-path_info) {
pos = strlen(SG(request_info).request_uri) -
strlen(rc-path_info);
- if (pos=0 pos=NS_BUF_SIZE rc-path_info) {
+ if (pos=0 possizeof(buf)) {
buf[pos] = '\0';
} else {
buf[0]='\0';
@@ -695,7 +691,7 @@
/* special variables in error mode */
if (rc-http_error) {
- snprintf(buf, NS_BUF_SIZE, %d, rc-http_error);
+ slprintf(buf, sizeof(buf), %d, rc-http_error);
php_register_variable(ERROR_TYPE, buf, track_vars_array
TSRMLS_CC);
}
}
--
PHP CVS Mailing List
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
thetaphiTue Mar 6 16:19:36 2007 UTC
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
use slprintf instead of snprintf and remove 0termination things (because
slprintf is always available now)
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.79r2=1.80diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.79 php-src/sapi/nsapi/nsapi.c:1.80
--- php-src/sapi/nsapi/nsapi.c:1.79 Mon Mar 5 16:28:39 2007
+++ php-src/sapi/nsapi/nsapi.c Tue Mar 6 16:19:36 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.79 2007/03/05 16:28:39 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.80 2007/03/06 16:19:36 thetaphi Exp $ */
/*
* PHP includes
@@ -73,8 +73,6 @@
#define NSLS_CC, NSLS_C
#define NSG(v) (request_context-v)
-#define NS_BUF_SIZE 2048
-
/*
* ZTS needs to be defined for NSAPI to work
*/
@@ -310,7 +308,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.79
$);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.80
$);
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 );
@@ -587,7 +585,7 @@
register size_t i;
int pos;
char *value,*p;
- char buf[NS_BUF_SIZE + 1];
+ char buf[2048];
struct pb_entry *entry;
for (i = 0; i nsapi_reqpb_size; i++) {
@@ -601,13 +599,12 @@
entry=rc-rq-headers-ht[i];
while (entry) {
if (strcasecmp(entry-param-name, content-length)==0
|| strcasecmp(entry-param-name, content-type)==0) {
- strlcpy(buf, entry-param-name, NS_BUF_SIZE);
+ strlcpy(buf, entry-param-name, sizeof(buf));
pos = 0;
} else {
- snprintf(buf, NS_BUF_SIZE, HTTP_%s,
entry-param-name);
+ slprintf(buf, sizeof(buf), HTTP_%s,
entry-param-name);
pos = 5;
}
- buf[NS_BUF_SIZE]='\0';
for(p = buf + pos; *p; p++) {
*p = toupper(*p);
if (*p 'A' || *p 'Z') {
@@ -638,7 +635,7 @@
nsapi_free(value);
}
- snprintf(buf, NS_BUF_SIZE, %d, conf_getglobals()-Vport);
+ slprintf(buf, sizeof(buf), %d, conf_getglobals()-Vport);
php_register_variable(SERVER_PORT, buf, track_vars_array TSRMLS_CC);
php_register_variable(SERVER_NAME,
conf_getglobals()-Vserver_hostname, track_vars_array TSRMLS_CC);
@@ -668,18 +665,17 @@
/* Create full Request-URI Script-Name */
if (SG(request_info).request_uri) {
- strlcpy(buf, SG(request_info).request_uri, NS_BUF_SIZE);
if (SG(request_info).query_string) {
- p = strchr(buf, 0);
- snprintf(p, NS_BUF_SIZE-(p-buf), ?%s,
SG(request_info).query_string);
- buf[NS_BUF_SIZE]='\0';
+ slprintf(buf, sizeof(buf), %s?%s,
SG(request_info).request_uri, SG(request_info).query_string);
+ } else {
+ strlcpy(buf, SG(request_info).request_uri, sizeof(buf));
}
php_register_variable(REQUEST_URI, buf, track_vars_array
TSRMLS_CC);
- strlcpy(buf, SG(request_info).request_uri, NS_BUF_SIZE);
+ strlcpy(buf, SG(request_info).request_uri, sizeof(buf));
if (rc-path_info) {
pos = strlen(SG(request_info).request_uri) -
strlen(rc-path_info);
- if (pos=0 pos=NS_BUF_SIZE rc-path_info) {
+ if (pos=0 possizeof(buf)) {
buf[pos] = '\0';
} else {
buf[0]='\0';
@@ -691,7 +687,7 @@
/* special variables in error mode */
if (rc-http_error) {
- snprintf(buf, NS_BUF_SIZE, %d, rc-http_error);
+ slprintf(buf, sizeof(buf), %d, rc-http_error);
php_register_variable(ERROR_TYPE, buf, track_vars_array
TSRMLS_CC);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
thetaphiTue Mar 6 18:15:05 2007 UTC
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
remove (large) static buffers for header names and request uri
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.80r2=1.81diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.80 php-src/sapi/nsapi/nsapi.c:1.81
--- php-src/sapi/nsapi/nsapi.c:1.80 Tue Mar 6 16:19:36 2007
+++ php-src/sapi/nsapi/nsapi.c Tue Mar 6 18:15:04 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.80 2007/03/06 16:19:36 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.81 2007/03/06 18:15:04 thetaphi Exp $ */
/*
* PHP includes
@@ -308,7 +308,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.80
$);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.81
$);
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 );
@@ -585,7 +585,7 @@
register size_t i;
int pos;
char *value,*p;
- char buf[2048];
+ char buf[32];
struct pb_entry *entry;
for (i = 0; i nsapi_reqpb_size; i++) {
@@ -599,19 +599,22 @@
entry=rc-rq-headers-ht[i];
while (entry) {
if (strcasecmp(entry-param-name, content-length)==0
|| strcasecmp(entry-param-name, content-type)==0) {
- strlcpy(buf, entry-param-name, sizeof(buf));
+ value=estrdup(entry-param-name);
pos = 0;
} else {
- slprintf(buf, sizeof(buf), HTTP_%s,
entry-param-name);
+ spprintf(value, 0, HTTP_%s,
entry-param-name);
pos = 5;
}
- for(p = buf + pos; *p; p++) {
- *p = toupper(*p);
- if (*p 'A' || *p 'Z') {
- *p = '_';
+ if (value) {
+ for(p = value + pos; *p; p++) {
+ *p = toupper(*p);
+ if (*p 'A' || *p 'Z') {
+ *p = '_';
+ }
}
+ php_register_variable(value,
entry-param-value, track_vars_array TSRMLS_CC);
+ efree(value);
}
- php_register_variable(buf, entry-param-value,
track_vars_array TSRMLS_CC);
entry=entry-next;
}
}
@@ -666,22 +669,27 @@
/* Create full Request-URI Script-Name */
if (SG(request_info).request_uri) {
if (SG(request_info).query_string) {
- slprintf(buf, sizeof(buf), %s?%s,
SG(request_info).request_uri, SG(request_info).query_string);
+ spprintf(value, 0, %s?%s,
SG(request_info).request_uri, SG(request_info).query_string);
+ if (value) {
+ php_register_variable(REQUEST_URI, value,
track_vars_array TSRMLS_CC);
+ efree(value);
+ }
} else {
- strlcpy(buf, SG(request_info).request_uri, sizeof(buf));
+ php_register_variable(REQUEST_URI,
SG(request_info).request_uri, track_vars_array TSRMLS_CC);
}
- php_register_variable(REQUEST_URI, buf, track_vars_array
TSRMLS_CC);
- strlcpy(buf, SG(request_info).request_uri, sizeof(buf));
- if (rc-path_info) {
- pos = strlen(SG(request_info).request_uri) -
strlen(rc-path_info);
- if (pos=0 possizeof(buf)) {
- buf[pos] = '\0';
- } else {
- buf[0]='\0';
+ if (value = nsapi_strdup(SG(request_info).request_uri)) {
+ if (rc-path_info) {
+ pos = strlen(SG(request_info).request_uri) -
strlen(rc-path_info);
+ if (pos=0) {
+ value[pos] = '\0';
+ } else {
+ value[0]='\0';
+ }
}
+
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/nsapi nsapi.c
thetaphiTue Mar 6 18:15:25 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/nsapi nsapi.c
Log:
remove (large) static buffers for header names and request uri
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.4r2=1.69.2.3.2.5diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.4
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.5
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.4 Tue Mar 6 15:43:49 2007
+++ php-src/sapi/nsapi/nsapi.c Tue Mar 6 18:15:25 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.4 2007/03/06 15:43:49 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.5 2007/03/06 18:15:25 thetaphi Exp $ */
/*
* PHP includes
@@ -308,7 +308,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.4 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.5 $);
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 );
@@ -587,7 +587,7 @@
register size_t i;
int pos;
char *value,*p;
- char buf[2048];
+ char buf[32];
struct pb_entry *entry;
for (i = 0; i nsapi_reqpb_size; i++) {
@@ -602,19 +602,22 @@
while (entry) {
if (!PG(safe_mode) || strncasecmp(entry-param-name,
authorization, 13)) {
if (strcasecmp(entry-param-name,
content-length)==0 || strcasecmp(entry-param-name, content-type)==0) {
- strlcpy(buf, entry-param-name,
sizeof(buf));
+ value=estrdup(entry-param-name);
pos = 0;
} else {
- slprintf(buf, sizeof(buf), HTTP_%s,
entry-param-name);
+ spprintf(value, 0, HTTP_%s,
entry-param-name);
pos = 5;
}
- for(p = buf + pos; *p; p++) {
- *p = toupper(*p);
- if (*p 'A' || *p 'Z') {
- *p = '_';
+ if (value) {
+ for(p = value + pos; *p; p++) {
+ *p = toupper(*p);
+ if (*p 'A' || *p 'Z') {
+ *p = '_';
+ }
}
+ php_register_variable(value,
entry-param-value, track_vars_array TSRMLS_CC);
+ efree(value);
}
- php_register_variable(buf, entry-param-value,
track_vars_array TSRMLS_CC);
}
entry=entry-next;
}
@@ -670,22 +673,27 @@
/* Create full Request-URI Script-Name */
if (SG(request_info).request_uri) {
if (SG(request_info).query_string) {
- slprintf(buf, sizeof(buf), %s?%s,
SG(request_info).request_uri, SG(request_info).query_string);
+ spprintf(value, 0, %s?%s,
SG(request_info).request_uri, SG(request_info).query_string);
+ if (value) {
+ php_register_variable(REQUEST_URI, value,
track_vars_array TSRMLS_CC);
+ efree(value);
+ }
} else {
- strlcpy(buf, SG(request_info).request_uri, sizeof(buf));
+ php_register_variable(REQUEST_URI,
SG(request_info).request_uri, track_vars_array TSRMLS_CC);
}
- php_register_variable(REQUEST_URI, buf, track_vars_array
TSRMLS_CC);
- strlcpy(buf, SG(request_info).request_uri, sizeof(buf));
- if (rc-path_info) {
- pos = strlen(SG(request_info).request_uri) -
strlen(rc-path_info);
- if (pos=0 possizeof(buf)) {
- buf[pos] = '\0';
- } else {
- buf[0]='\0';
+ if (value = nsapi_strdup(SG(request_info).request_uri)) {
+ if (rc-path_info) {
+ pos
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi-readme.txt nsapi.c
thetaphiTue Mar 6 19:47:12 2007 UTC Modified files: /php-src/sapi/nsapi nsapi-readme.txt nsapi.c Log: Update function names for PHP6 to php6* http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi-readme.txt?r1=1.13r2=1.14diff_format=u Index: php-src/sapi/nsapi/nsapi-readme.txt diff -u php-src/sapi/nsapi/nsapi-readme.txt:1.13 php-src/sapi/nsapi/nsapi-readme.txt:1.14 --- php-src/sapi/nsapi/nsapi-readme.txt:1.13Fri Oct 27 07:29:15 2006 +++ php-src/sapi/nsapi/nsapi-readme.txt Tue Mar 6 19:47:12 2007 @@ -1,4 +1,4 @@ -Configuration of your Netscape/iPlanet/Sun Webserver for PHP5 +Configuration of your Netscape/iPlanet/Sun Webserver for PHP6 - These instructions are targetted at Netscape Enterprise Web Server and @@ -28,13 +28,13 @@ for iPlanet/Sun Webserver 6.0 and above however at the end of the path-to-server/https-servername/config/magnus.conf file: -Init fn=load-modules funcs=php5_init,php5_execute,php5_auth_trans shlib=/path/to/phplibrary -Init fn=php5_init errorString=Failed to initialize PHP! [php_ini=/path/to/php.ini] +Init fn=load-modules funcs=php6_init,php6_execute,php6_auth_trans shlib=/path/to/phplibrary +Init fn=php6_init errorString=Failed to initialize PHP! [php_ini=/path/to/php.ini] The shlib will vary depending on your OS: - Unix: path-to-server/bin/libphp5.so. - Windows: c:/path/to/php5/php5nsapi.dll + Unix: path-to-server/bin/libphp6.so. + Windows: c:/path/to/php6/php6nsapi.dll In obj.conf (for virtual server classes [Sun 6.0+] in their vserver.obj.conf): @@ -50,7 +50,7 @@ # For boolean ini-keys please use 0/1 as value, NOT On,Off,... (this will not work # correctly), e.g. zlib.output_compression=1 instead of zlib.output_compression=On -Service fn=php5_execute type=magnus-internal/x-httpd-php [inikey=value ...] +Service fn=php6_execute type=magnus-internal/x-httpd-php [inikey=value ...] . . . @@ -61,7 +61,7 @@ Object name=x-httpd-php ObjectType fn=force-type type=magnus-internal/x-httpd-php -Service fn=php5_execute [inikey=value ...] +Service fn=php6_execute [inikey=value ...] /Object After that you can configure a directory in the Administration server and assign it @@ -81,7 +81,7 @@ Authentication for the entire server, add the following line: Object name=default -AuthTrans fn=php5_auth_trans +AuthTrans fn=php6_auth_trans . . . @@ -92,7 +92,7 @@ To use PHP Authentication on a single directory, add the following: Object ppath=d:\path\to\authenticated\dir\* -AuthTrans fn=php5_auth_trans +AuthTrans fn=php6_auth_trans /Object @@ -103,7 +103,7 @@ or similar. Add the following line to the object in obj.conf for every error page you want to overwrite: -Error fn=php5_execute code=XXX script=/path/to/script.php [inikey=value inikey=value...] +Error fn=php6_execute code=XXX script=/path/to/script.php [inikey=value inikey=value...] where XXX ist the HTTP error code. Please delete any other Error directives which could interfere with yours. @@ -116,7 +116,7 @@ replace the corresponding default Service line for type=magnus-internal/directory in obj.conf with the following: -Service fn=php5_execute type=magnus-internal/directory script=/path/to/script.php [inikey=value inikey=value...] +Service fn=php6_execute type=magnus-internal/directory script=/path/to/script.php [inikey=value inikey=value...] For both error and directory listing pages the original URI and translated URI are in the variables $_SERVER['PATH_INFO'] and @@ -141,9 +141,9 @@ fails and nsapi_virtual() is disabled. If this is the case, try the following: -Add the following parameter to php5_init in magnus.conf: +Add the following parameter to php6_init in magnus.conf: -Init fn=php5_init ... server_lib=ns-httpdXX.dll +Init fn=php6_init ... server_lib=ns-httpdXX.dll where XX is the correct DLL version number. To get it, look in the server-root for the correct DLL name. The DLL with the biggest filesize is the right one. @@ -151,4 +151,4 @@ But be warned: SUPPORT FOR nsapi_virtual() IS EXPERIMENTAL !!! -$Id: nsapi-readme.txt,v 1.13 2006/10/27 07:29:15 thetaphi Exp $ +$Id: nsapi-readme.txt,v 1.14 2007/03/06 19:47:12 thetaphi Exp $ http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.81r2=1.82diff_format=u Index: php-src/sapi/nsapi/nsapi.c diff -u php-src/sapi/nsapi/nsapi.c:1.81 php-src/sapi/nsapi/nsapi.c:1.82 --- php-src/sapi/nsapi/nsapi.c:1.81 Tue Mar 6 18:15:04 2007 +++ php-src/sapi/nsapi/nsapi.c Tue Mar 6 19:47:12 2007 @@ -1,6 +1,6 @@ /* +--+ - | PHP Version 5| + | PHP Version 6|
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
thetaphiMon Mar 5 16:28:39 2007 UTC
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
snprintf patch
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.78r2=1.79diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.78 php-src/sapi/nsapi/nsapi.c:1.79
--- php-src/sapi/nsapi/nsapi.c:1.78 Sat Feb 24 16:25:55 2007
+++ php-src/sapi/nsapi/nsapi.c Mon Mar 5 16:28:39 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.78 2007/02/24 16:25:55 helly Exp $ */
+/* $Id: nsapi.c,v 1.79 2007/03/05 16:28:39 thetaphi 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.78
$);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.79
$);
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 );
@@ -638,7 +638,7 @@
nsapi_free(value);
}
- snprintf(buf, sizeof(buf), %d, conf_getglobals()-Vport);
+ snprintf(buf, NS_BUF_SIZE, %d, conf_getglobals()-Vport);
php_register_variable(SERVER_PORT, buf, track_vars_array TSRMLS_CC);
php_register_variable(SERVER_NAME,
conf_getglobals()-Vserver_hostname, track_vars_array TSRMLS_CC);
@@ -691,7 +691,7 @@
/* special variables in error mode */
if (rc-http_error) {
- snprintf(buf, sizeof(buf), %d, rc-http_error);
+ snprintf(buf, NS_BUF_SIZE, %d, rc-http_error);
php_register_variable(ERROR_TYPE, buf, track_vars_array
TSRMLS_CC);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/nsapi nsapi.c
thetaphiMon Mar 5 16:29:18 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/nsapi nsapi.c
Log:
snprintf patch
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.2r2=1.69.2.3.2.3diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.2
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.3
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.2 Sat Feb 24 02:17:28 2007
+++ php-src/sapi/nsapi/nsapi.c Mon Mar 5 16:29:18 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.2 2007/02/24 02:17:28 helly Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.3 2007/03/05 16:29:18 thetaphi 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.2.3.2.2 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.3 $);
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 );
@@ -642,7 +642,7 @@
nsapi_free(value);
}
- snprintf(buf, sizeof(buf), %d, conf_getglobals()-Vport);
+ snprintf(buf, NS_BUF_SIZE, %d, conf_getglobals()-Vport);
php_register_variable(SERVER_PORT, buf, track_vars_array TSRMLS_CC);
php_register_variable(SERVER_NAME,
conf_getglobals()-Vserver_hostname, track_vars_array TSRMLS_CC);
@@ -695,7 +695,7 @@
/* special variables in error mode */
if (rc-http_error) {
- snprintf(buf, sizeof(buf), %d, rc-http_error);
+ snprintf(buf, NS_BUF_SIZE, %d, rc-http_error);
php_register_variable(ERROR_TYPE, buf, track_vars_array
TSRMLS_CC);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi config.m4
thetaphiFri Oct 27 07:22:46 2006 UTC Modified files: /php-src/sapi/nsapi config.m4 Log: Fix build in Sun Webserver 7 http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/config.m4?r1=1.17r2=1.18diff_format=u Index: php-src/sapi/nsapi/config.m4 diff -u php-src/sapi/nsapi/config.m4:1.17 php-src/sapi/nsapi/config.m4:1.18 --- php-src/sapi/nsapi/config.m4:1.17 Sun Jun 1 21:45:04 2003 +++ php-src/sapi/nsapi/config.m4Fri Oct 27 07:22:46 2006 @@ -1,10 +1,10 @@ dnl -dnl $Id: config.m4,v 1.17 2003/06/01 21:45:04 thetaphi Exp $ +dnl $Id: config.m4,v 1.18 2006/10/27 07:22:46 thetaphi Exp $ dnl AC_MSG_CHECKING(for NSAPI support) AC_ARG_WITH(nsapi, -[ --with-nsapi=DIRBuild PHP as NSAPI module for Netscape/iPlanet/SunONE],[ +[ --with-nsapi=DIRBuild PHP as NSAPI module for Netscape/iPlanet/Sun Webserver],[ PHP_NSAPI=$withval ],[ PHP_NSAPI=no @@ -13,20 +13,20 @@ if test $PHP_NSAPI != no; then if test ! -d $PHP_NSAPI/bin ; then -AC_MSG_ERROR(Please specify the path to the root of your Netscape/iPlanet/SunONE server using --with-nsapi=DIR) +AC_MSG_ERROR(Please specify the path to the root of your Netscape/iPlanet/Sun Webserver using --with-nsapi=DIR) fi AC_MSG_CHECKING(for NSAPI include files) if test -d $PHP_NSAPI/include ; then -NSAPI_INCLUDE=$PHP_NSAPI/include -AC_MSG_RESULT(Netscape-Enterprise 3.x style) -AC_CHECK_HEADERS([$NSAPI_INCLUDE/nsapi.h]) +NSAPI_INC_DIR=$PHP_NSAPI/include +AC_MSG_RESULT(Netscape 3.x / Sun 7.x style) +AC_CHECK_HEADERS([$NSAPI_INC_DIR/nsapi.h]) +NSAPI_INCLUDE=-I$NSAPI_INC_DIR fi if test -d $PHP_NSAPI/plugins/include ; then -test -n $NSAPI_INCLUDE NSAPI_INC_DIR=-I$NSAPI_INCLUDE -NSAPI_INCLUDE=$PHP_NSAPI/plugins/include -AC_MSG_RESULT(iPlanet 4.x / SunONE 6.x style) -AC_CHECK_HEADERS([$NSAPI_INCLUDE/nsapi.h]) -NSAPI_INCLUDE=$NSAPI_INC_DIR -I$NSAPI_INCLUDE +NSAPI_INC_DIR=$PHP_NSAPI/plugins/include +AC_MSG_RESULT(iPlanet 4.x / Sun 6.x style) +AC_CHECK_HEADERS([$NSAPI_INC_DIR/nsapi.h]) +NSAPI_INCLUDE=$NSAPI_INCLUDE -I$NSAPI_INC_DIR fi if test $NSAPI_INCLUDE = ; then AC_MSG_ERROR(Please check you have nsapi.h in either $PHP_NSAPI/include or $PHP_NSAPI/plugins/include) @@ -34,7 +34,7 @@ PHP_EVAL_INCLINE($NSAPI_INCLUDE) PHP_BUILD_THREAD_SAFE - AC_DEFINE(HAVE_NSAPI,1,[Whether you have a Netscape/iPlanet/SunONE Server]) + AC_DEFINE(HAVE_NSAPI,1,[Whether you have a Netscape/iPlanet/Sun Webserver]) PHP_SELECT_SAPI(nsapi, shared, nsapi.c) INSTALL_IT=\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_NSAPI/bin/ fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/nsapi config.m4
thetaphiFri Oct 27 07:23:44 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/sapi/nsapi config.m4 Log: Fix build in Sun Webserver 7 (should be in 5.2.0, it's not critical but does not break mainstream sapis!!!) http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/config.m4?r1=1.17r2=1.17.6.1diff_format=u Index: php-src/sapi/nsapi/config.m4 diff -u php-src/sapi/nsapi/config.m4:1.17 php-src/sapi/nsapi/config.m4:1.17.6.1 --- php-src/sapi/nsapi/config.m4:1.17 Sun Jun 1 21:45:04 2003 +++ php-src/sapi/nsapi/config.m4Fri Oct 27 07:23:44 2006 @@ -1,10 +1,10 @@ dnl -dnl $Id: config.m4,v 1.17 2003/06/01 21:45:04 thetaphi Exp $ +dnl $Id: config.m4,v 1.17.6.1 2006/10/27 07:23:44 thetaphi Exp $ dnl AC_MSG_CHECKING(for NSAPI support) AC_ARG_WITH(nsapi, -[ --with-nsapi=DIRBuild PHP as NSAPI module for Netscape/iPlanet/SunONE],[ +[ --with-nsapi=DIRBuild PHP as NSAPI module for Netscape/iPlanet/Sun Webserver],[ PHP_NSAPI=$withval ],[ PHP_NSAPI=no @@ -13,20 +13,20 @@ if test $PHP_NSAPI != no; then if test ! -d $PHP_NSAPI/bin ; then -AC_MSG_ERROR(Please specify the path to the root of your Netscape/iPlanet/SunONE server using --with-nsapi=DIR) +AC_MSG_ERROR(Please specify the path to the root of your Netscape/iPlanet/Sun Webserver using --with-nsapi=DIR) fi AC_MSG_CHECKING(for NSAPI include files) if test -d $PHP_NSAPI/include ; then -NSAPI_INCLUDE=$PHP_NSAPI/include -AC_MSG_RESULT(Netscape-Enterprise 3.x style) -AC_CHECK_HEADERS([$NSAPI_INCLUDE/nsapi.h]) +NSAPI_INC_DIR=$PHP_NSAPI/include +AC_MSG_RESULT(Netscape 3.x / Sun 7.x style) +AC_CHECK_HEADERS([$NSAPI_INC_DIR/nsapi.h]) +NSAPI_INCLUDE=-I$NSAPI_INC_DIR fi if test -d $PHP_NSAPI/plugins/include ; then -test -n $NSAPI_INCLUDE NSAPI_INC_DIR=-I$NSAPI_INCLUDE -NSAPI_INCLUDE=$PHP_NSAPI/plugins/include -AC_MSG_RESULT(iPlanet 4.x / SunONE 6.x style) -AC_CHECK_HEADERS([$NSAPI_INCLUDE/nsapi.h]) -NSAPI_INCLUDE=$NSAPI_INC_DIR -I$NSAPI_INCLUDE +NSAPI_INC_DIR=$PHP_NSAPI/plugins/include +AC_MSG_RESULT(iPlanet 4.x / Sun 6.x style) +AC_CHECK_HEADERS([$NSAPI_INC_DIR/nsapi.h]) +NSAPI_INCLUDE=$NSAPI_INCLUDE -I$NSAPI_INC_DIR fi if test $NSAPI_INCLUDE = ; then AC_MSG_ERROR(Please check you have nsapi.h in either $PHP_NSAPI/include or $PHP_NSAPI/plugins/include) @@ -34,7 +34,7 @@ PHP_EVAL_INCLINE($NSAPI_INCLUDE) PHP_BUILD_THREAD_SAFE - AC_DEFINE(HAVE_NSAPI,1,[Whether you have a Netscape/iPlanet/SunONE Server]) + AC_DEFINE(HAVE_NSAPI,1,[Whether you have a Netscape/iPlanet/Sun Webserver]) PHP_SELECT_SAPI(nsapi, shared, nsapi.c) INSTALL_IT=\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_NSAPI/bin/ fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi-readme.txt
thetaphiFri Oct 27 07:29:15 2006 UTC Modified files: /php-src/sapi/nsapi nsapi-readme.txt Log: update readme http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi-readme.txt?r1=1.12r2=1.13diff_format=u Index: php-src/sapi/nsapi/nsapi-readme.txt diff -u php-src/sapi/nsapi/nsapi-readme.txt:1.12 php-src/sapi/nsapi/nsapi-readme.txt:1.13 --- php-src/sapi/nsapi/nsapi-readme.txt:1.12Thu Mar 18 13:37:16 2004 +++ php-src/sapi/nsapi/nsapi-readme.txt Fri Oct 27 07:29:15 2006 @@ -1,8 +1,8 @@ -Configuration of your Netscape/SunONE/iPlanet Web Server for PHP5 +Configuration of your Netscape/iPlanet/Sun Webserver for PHP5 - These instructions are targetted at Netscape Enterprise Web Server and -SUN/Netscape Alliance iPlanet Web Server/SunONE Webserver. +SUN/Netscape Alliance iPlanet Web Server and the new Sun Java System Webserver. On other web servers your milage may vary. Firstly you may need to add some paths to the LD_LIBRARY_PATH @@ -13,7 +13,7 @@ path-to-netscape-server/https-servername/start -Netscape/iPlanet/SunONE config files are located in: +Netscape/iPlanet/Sun config files are located in: path-to-server/https-servername/config @@ -25,7 +25,7 @@ Place the following two lines after mime.types init in path-to-server/https-servername/config/obj.conf (for servers 6) or -for iPlanet/SunONE Web Server 6.0 and above however at the end of the +for iPlanet/Sun Webserver 6.0 and above however at the end of the path-to-server/https-servername/config/magnus.conf file: Init fn=load-modules funcs=php5_init,php5_execute,php5_auth_trans shlib=/path/to/phplibrary @@ -37,7 +37,7 @@ Windows: c:/path/to/php5/php5nsapi.dll -In obj.conf (for virtual server classes [SunONE 6.0+] in their vserver.obj.conf): +In obj.conf (for virtual server classes [Sun 6.0+] in their vserver.obj.conf): Object name=default . @@ -137,7 +137,7 @@ Under Windows limitations in the DLL handling need the use of a automatic detection of the most recent ns-httpdXX.dll file. This is tested for servers -till version 6.1. If a newer version of the SunONE server is used, the detection +till version 6.1. If a newer version of the Sun server is used, the detection fails and nsapi_virtual() is disabled. If this is the case, try the following: @@ -151,4 +151,4 @@ But be warned: SUPPORT FOR nsapi_virtual() IS EXPERIMENTAL !!! -$Id: nsapi-readme.txt,v 1.12 2004/03/18 13:37:16 thetaphi Exp $ +$Id: nsapi-readme.txt,v 1.13 2006/10/27 07:29:15 thetaphi Exp $ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/nsapi nsapi-readme.txt
thetaphiFri Oct 27 07:29:51 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/sapi/nsapi nsapi-readme.txt Log: MFH: update readme http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi-readme.txt?r1=1.12r2=1.12.6.1diff_format=u Index: php-src/sapi/nsapi/nsapi-readme.txt diff -u php-src/sapi/nsapi/nsapi-readme.txt:1.12 php-src/sapi/nsapi/nsapi-readme.txt:1.12.6.1 --- php-src/sapi/nsapi/nsapi-readme.txt:1.12Thu Mar 18 13:37:16 2004 +++ php-src/sapi/nsapi/nsapi-readme.txt Fri Oct 27 07:29:51 2006 @@ -1,8 +1,8 @@ -Configuration of your Netscape/SunONE/iPlanet Web Server for PHP5 +Configuration of your Netscape/iPlanet/Sun Webserver for PHP5 - These instructions are targetted at Netscape Enterprise Web Server and -SUN/Netscape Alliance iPlanet Web Server/SunONE Webserver. +SUN/Netscape Alliance iPlanet Web Server and the new Sun Java System Webserver. On other web servers your milage may vary. Firstly you may need to add some paths to the LD_LIBRARY_PATH @@ -13,7 +13,7 @@ path-to-netscape-server/https-servername/start -Netscape/iPlanet/SunONE config files are located in: +Netscape/iPlanet/Sun config files are located in: path-to-server/https-servername/config @@ -25,7 +25,7 @@ Place the following two lines after mime.types init in path-to-server/https-servername/config/obj.conf (for servers 6) or -for iPlanet/SunONE Web Server 6.0 and above however at the end of the +for iPlanet/Sun Webserver 6.0 and above however at the end of the path-to-server/https-servername/config/magnus.conf file: Init fn=load-modules funcs=php5_init,php5_execute,php5_auth_trans shlib=/path/to/phplibrary @@ -37,7 +37,7 @@ Windows: c:/path/to/php5/php5nsapi.dll -In obj.conf (for virtual server classes [SunONE 6.0+] in their vserver.obj.conf): +In obj.conf (for virtual server classes [Sun 6.0+] in their vserver.obj.conf): Object name=default . @@ -137,7 +137,7 @@ Under Windows limitations in the DLL handling need the use of a automatic detection of the most recent ns-httpdXX.dll file. This is tested for servers -till version 6.1. If a newer version of the SunONE server is used, the detection +till version 6.1. If a newer version of the Sun server is used, the detection fails and nsapi_virtual() is disabled. If this is the case, try the following: @@ -151,4 +151,4 @@ But be warned: SUPPORT FOR nsapi_virtual() IS EXPERIMENTAL !!! -$Id: nsapi-readme.txt,v 1.12 2004/03/18 13:37:16 thetaphi Exp $ +$Id: nsapi-readme.txt,v 1.12.6.1 2006/10/27 07:29:51 thetaphi Exp $ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
thetaphiFri Oct 27 09:02:54 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: update news http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.312r2=1.2027.2.547.2.313diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.312 php-src/NEWS:1.2027.2.547.2.313 --- php-src/NEWS:1.2027.2.547.2.312 Fri Oct 20 01:51:07 2006 +++ php-src/NEWSFri Oct 27 09:02:54 2006 @@ -1,5 +1,8 @@ PHPNEWS ||| +00 Oct 2006, PHP 5.2.0RC7 +- Fixed bug #39192 (Not including nsapi.h properly with SJSWS 7). + This will make PHP 5.2 compatible to new Sun Webserver. (Uwe) 19 Oct 2006, PHP 5.2.0RC6 - Fixed invalid read in imagecreatefrompng when an empty file is given (Pierre, Tony) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/sybase_ct php_sybase_ct.c
thetaphiTue Jul 25 08:42:54 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/sybase_ct php_sybase_ct.c
Log:
Fix compilation with TSRM
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.103.2.5.2.3r2=1.103.2.5.2.4diff_format=u
Index: php-src/ext/sybase_ct/php_sybase_ct.c
diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.3
php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.4
--- php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.3 Sun Jul 23 23:50:43 2006
+++ php-src/ext/sybase_ct/php_sybase_ct.c Tue Jul 25 08:42:54 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_sybase_ct.c,v 1.103.2.5.2.3 2006/07/23 23:50:43 sniper Exp $ */
+/* $Id: php_sybase_ct.c,v 1.103.2.5.2.4 2006/07/25 08:42:54 thetaphi Exp $ */
#ifdef HAVE_CONFIG_H
@@ -161,7 +161,7 @@
}
/* Forward declaration */
-static int php_sybase_finish_results (sybase_result *result);
+static int php_sybase_finish_results (sybase_result *result TSRMLS_DC);
static void php_free_sybase_result(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{
@@ -172,7 +172,7 @@
if (result-sybase_ptr-cmd) {
ct_cancel(NULL, result-sybase_ptr-cmd, CS_CANCEL_ALL);
}
- php_sybase_finish_results(result);
+ php_sybase_finish_results(result TSRMLS_CC);
}
_free_sybase_result(result);
@@ -290,10 +290,10 @@
ZVAL_LONG(line, srvmsg-line);
args[3] = line;
- MAKE_STD_ZVAL(text);
+ MAKE_STD_ZVAL(text);
ZVAL_STRING(text, srvmsg-text, 1);
args[4] = text;
-
+
if (call_user_function_ex(EG(function_table), NULL,
callback_name, retval, 5, args, 0, NULL TSRMLS_CC) == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Sybase:
Cannot call the messagehandler %s, Z_STRVAL_P(callback_name));
}
@@ -401,10 +401,10 @@
}
}
- /* Set the timeout, which is per context and can't be set with
-* ct_con_props(), so set it globally from the config value if
+ /* Set the timeout, which is per context and can't be set with
+* ct_con_props(), so set it globally from the config value if
* requested. The default is CS_NO_LIMIT.
-*
+*
* Note that despite some noise in the documentation about using
* signals to implement timeouts, they are actually implemented
* by using poll() or select() on Solaris and Linux.
@@ -502,7 +502,7 @@
}
if (appname) {
ct_con_props(sybase-connection, CS_SET, CS_APPNAME, appname,
CS_NULLTERM, NULL);
- } else {
+ } else {
ct_con_props(sybase-connection, CS_SET, CS_APPNAME,
SybCtG(appname), CS_NULLTERM, NULL);
}
@@ -527,7 +527,7 @@
}
}
}
-
+
if (cfg_get_long(sybct.packet_size, packetsize) == SUCCESS) {
if (ct_con_props(sybase-connection, CS_SET, CS_PACKETSIZE,
(CS_VOID *)packetsize, CS_UNUSED, NULL) != CS_SUCCEED) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Sybase:
Unable to update connection packetsize.);
@@ -535,15 +535,15 @@
}
/* Set the login timeout. Actually, the login timeout is per context
-* and not per connection, but we will update the context here to
+* and not per connection, but we will update the context here to
* allow for code such as the following:
-*
+*
* ini_set('sybct.login_timeout', $timeout);
* sybase_connect(...)
-*
-* Note that preceding calls to sybase_connect() will now use the
+*
+* Note that preceding calls to sybase_connect() will now use the
* updated value and not the default one!
-*
+*
* The default value for CS_LOGIN_TIMEOUT is 60 (1 minute).
*/
if (SybCtG(login_timeout) != -1) {
@@ -1020,12 +1020,12 @@
/* }}} */
-static int php_sybase_finish_results(sybase_result *result TSRMLS_DC)
+static int php_sybase_finish_results(sybase_result *result TSRMLS_DC)
{
int i, fail;
CS_RETCODE retcode;
CS_INT restype;
-
+
efree(result-datafmt);
efree(result-lengths);
efree(result-indicators);
@@ -1101,7 +1101,7 @@
* dead ourselves.
*/
result-sybase_ptr-dead = 1;
-
+
case CS_CANCELED:
default:
_free_sybase_result(result);
@@ -1131,12 +1131,12 @@
int i, j;
CS_INT retcode;
TSRMLS_FETCH();
-
+
/* We've already fetched everything */
if
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/sybase_ct php_sybase_ct.c
thetaphiTue Jul 25 09:19:39 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/sybase_ct php_sybase_ct.c
Log:
revert shitty whitespace patch (forgot to reconfigure my editor after
reinstallation)
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.103.2.5.2.4r2=1.103.2.5.2.5diff_format=u
Index: php-src/ext/sybase_ct/php_sybase_ct.c
diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.4
php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.5
--- php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.4 Tue Jul 25 08:42:54 2006
+++ php-src/ext/sybase_ct/php_sybase_ct.c Tue Jul 25 09:19:38 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_sybase_ct.c,v 1.103.2.5.2.4 2006/07/25 08:42:54 thetaphi Exp $ */
+/* $Id: php_sybase_ct.c,v 1.103.2.5.2.5 2006/07/25 09:19:38 thetaphi Exp $ */
#ifdef HAVE_CONFIG_H
@@ -161,7 +161,7 @@
}
/* Forward declaration */
-static int php_sybase_finish_results (sybase_result *result TSRMLS_DC);
+static int php_sybase_finish_results (sybase_result *result);
static void php_free_sybase_result(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{
@@ -172,7 +172,7 @@
if (result-sybase_ptr-cmd) {
ct_cancel(NULL, result-sybase_ptr-cmd, CS_CANCEL_ALL);
}
- php_sybase_finish_results(result TSRMLS_CC);
+ php_sybase_finish_results(result);
}
_free_sybase_result(result);
@@ -290,10 +290,10 @@
ZVAL_LONG(line, srvmsg-line);
args[3] = line;
- MAKE_STD_ZVAL(text);
+ MAKE_STD_ZVAL(text);
ZVAL_STRING(text, srvmsg-text, 1);
args[4] = text;
-
+
if (call_user_function_ex(EG(function_table), NULL,
callback_name, retval, 5, args, 0, NULL TSRMLS_CC) == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Sybase:
Cannot call the messagehandler %s, Z_STRVAL_P(callback_name));
}
@@ -401,10 +401,10 @@
}
}
- /* Set the timeout, which is per context and can't be set with
-* ct_con_props(), so set it globally from the config value if
+ /* Set the timeout, which is per context and can't be set with
+* ct_con_props(), so set it globally from the config value if
* requested. The default is CS_NO_LIMIT.
-*
+*
* Note that despite some noise in the documentation about using
* signals to implement timeouts, they are actually implemented
* by using poll() or select() on Solaris and Linux.
@@ -502,7 +502,7 @@
}
if (appname) {
ct_con_props(sybase-connection, CS_SET, CS_APPNAME, appname,
CS_NULLTERM, NULL);
- } else {
+ } else {
ct_con_props(sybase-connection, CS_SET, CS_APPNAME,
SybCtG(appname), CS_NULLTERM, NULL);
}
@@ -527,7 +527,7 @@
}
}
}
-
+
if (cfg_get_long(sybct.packet_size, packetsize) == SUCCESS) {
if (ct_con_props(sybase-connection, CS_SET, CS_PACKETSIZE,
(CS_VOID *)packetsize, CS_UNUSED, NULL) != CS_SUCCEED) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Sybase:
Unable to update connection packetsize.);
@@ -535,15 +535,15 @@
}
/* Set the login timeout. Actually, the login timeout is per context
-* and not per connection, but we will update the context here to
+* and not per connection, but we will update the context here to
* allow for code such as the following:
-*
+*
* ini_set('sybct.login_timeout', $timeout);
* sybase_connect(...)
-*
-* Note that preceding calls to sybase_connect() will now use the
+*
+* Note that preceding calls to sybase_connect() will now use the
* updated value and not the default one!
-*
+*
* The default value for CS_LOGIN_TIMEOUT is 60 (1 minute).
*/
if (SybCtG(login_timeout) != -1) {
@@ -1020,12 +1020,12 @@
/* }}} */
-static int php_sybase_finish_results(sybase_result *result TSRMLS_DC)
+static int php_sybase_finish_results(sybase_result *result TSRMLS_DC)
{
int i, fail;
CS_RETCODE retcode;
CS_INT restype;
-
+
efree(result-datafmt);
efree(result-lengths);
efree(result-indicators);
@@ -1101,7 +1101,7 @@
* dead ourselves.
*/
result-sybase_ptr-dead = 1;
-
+
case CS_CANCELED:
default:
_free_sybase_result(result);
@@ -1131,12 +1131,12 @@
int i, j;
CS_INT retcode;
TSRMLS_FETCH();
-
+
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/sybase_ct php_sybase_ct.c
thetaphiTue Jul 25 09:20:32 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/sybase_ct php_sybase_ct.c
Log:
MFH: Fix compilation with TSRM (now correct)
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.103.2.5.2.5r2=1.103.2.5.2.6diff_format=u
Index: php-src/ext/sybase_ct/php_sybase_ct.c
diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.5
php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.6
--- php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.5 Tue Jul 25 09:19:38 2006
+++ php-src/ext/sybase_ct/php_sybase_ct.c Tue Jul 25 09:20:32 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_sybase_ct.c,v 1.103.2.5.2.5 2006/07/25 09:19:38 thetaphi Exp $ */
+/* $Id: php_sybase_ct.c,v 1.103.2.5.2.6 2006/07/25 09:20:32 thetaphi Exp $ */
#ifdef HAVE_CONFIG_H
@@ -161,7 +161,7 @@
}
/* Forward declaration */
-static int php_sybase_finish_results (sybase_result *result);
+static int php_sybase_finish_results (sybase_result *result TSRMLS_DC);
static void php_free_sybase_result(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{
@@ -172,7 +172,7 @@
if (result-sybase_ptr-cmd) {
ct_cancel(NULL, result-sybase_ptr-cmd, CS_CANCEL_ALL);
}
- php_sybase_finish_results(result);
+ php_sybase_finish_results(result TSRMLS_CC);
}
_free_sybase_result(result);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sybase_ct php_sybase_ct.c
thetaphiTue Jul 25 09:12:07 2006 UTC
Modified files:
/php-src/ext/sybase_ct php_sybase_ct.c
Log:
Fix compilation with TSRM
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.113r2=1.114diff_format=u
Index: php-src/ext/sybase_ct/php_sybase_ct.c
diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.113
php-src/ext/sybase_ct/php_sybase_ct.c:1.114
--- php-src/ext/sybase_ct/php_sybase_ct.c:1.113 Sun Jul 23 23:50:24 2006
+++ php-src/ext/sybase_ct/php_sybase_ct.c Tue Jul 25 09:12:07 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_sybase_ct.c,v 1.113 2006/07/23 23:50:24 sniper Exp $ */
+/* $Id: php_sybase_ct.c,v 1.114 2006/07/25 09:12:07 thetaphi Exp $ */
#ifdef HAVE_CONFIG_H
@@ -161,7 +161,7 @@
}
/* Forward declaration */
-static int php_sybase_finish_results (sybase_result *result);
+static int php_sybase_finish_results (sybase_result *result TSRMLS_DC);
static void php_free_sybase_result(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{
@@ -172,7 +172,7 @@
if (result-sybase_ptr-cmd) {
ct_cancel(NULL, result-sybase_ptr-cmd, CS_CANCEL_ALL);
}
- php_sybase_finish_results(result);
+ php_sybase_finish_results(result TSRMLS_CC);
}
_free_sybase_result(result);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
thetaphiSat Apr 29 21:50:17 2006 UTC
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
Remove hiding of authorization headers completely because safe mode canceled
http://cvs.php.net/viewcvs.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.73r2=1.74diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.73 php-src/sapi/nsapi/nsapi.c:1.74
--- php-src/sapi/nsapi/nsapi.c:1.73 Tue Mar 7 14:43:16 2006
+++ php-src/sapi/nsapi/nsapi.c Sat Apr 29 21:50:17 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.73 2006/03/07 14:43:16 iliaa Exp $ */
+/* $Id: nsapi.c,v 1.74 2006/04/29 21:50:17 thetaphi 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.73
$);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.74
$);
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 );
@@ -410,9 +410,7 @@
for (i=0; i rc-rq-headers-hsize; i++) {
entry=rc-rq-headers-ht[i];
while (entry) {
- if (strncasecmp(entry-param-name, authorization,
13)) {
- add_assoc_string(return_value,
entry-param-name, entry-param-value, 1);
- }
+ add_assoc_string(return_value, entry-param-name,
entry-param-value, 1);
entry=entry-next;
}
}
@@ -602,23 +600,21 @@
for (i=0; i rc-rq-headers-hsize; i++) {
entry=rc-rq-headers-ht[i];
while (entry) {
- if (strncasecmp(entry-param-name, authorization,
13)) {
- if (strcasecmp(entry-param-name,
content-length)==0 || strcasecmp(entry-param-name, content-type)==0) {
- strlcpy(buf, entry-param-name,
NS_BUF_SIZE);
- pos = 0;
- } else {
- snprintf(buf, NS_BUF_SIZE, HTTP_%s,
entry-param-name);
- pos = 5;
- }
- buf[NS_BUF_SIZE]='\0';
- for(p = buf + pos; *p; p++) {
- *p = toupper(*p);
- if (*p 'A' || *p 'Z') {
- *p = '_';
- }
+ if (strcasecmp(entry-param-name, content-length)==0
|| strcasecmp(entry-param-name, content-type)==0) {
+ strlcpy(buf, entry-param-name, NS_BUF_SIZE);
+ pos = 0;
+ } else {
+ snprintf(buf, NS_BUF_SIZE, HTTP_%s,
entry-param-name);
+ pos = 5;
+ }
+ buf[NS_BUF_SIZE]='\0';
+ for(p = buf + pos; *p; p++) {
+ *p = toupper(*p);
+ if (*p 'A' || *p 'Z') {
+ *p = '_';
}
- php_register_variable(buf, entry-param-value,
track_vars_array TSRMLS_CC);
}
+ php_register_variable(buf, entry-param-value,
track_vars_array TSRMLS_CC);
entry=entry-next;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /scripts Makefile.frag
thetaphiMon Jun 6 07:00:48 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/scriptsMakefile.frag Log: Fix bug #33166 for other branches and new bug #33255 http://cvs.php.net/diff.php/php-src/scripts/Makefile.frag?r1=1.10.2.7r2=1.10.2.8ty=u Index: php-src/scripts/Makefile.frag diff -u php-src/scripts/Makefile.frag:1.10.2.7 php-src/scripts/Makefile.frag:1.10.2.8 --- php-src/scripts/Makefile.frag:1.10.2.7 Sat Apr 30 00:30:20 2005 +++ php-src/scripts/Makefile.frag Mon Jun 6 07:00:48 2005 @@ -21,7 +21,6 @@ config.sub bin_SCRIPTS = phpize php-config -bin_src_SCRIPTS = man_PAGES = phpize.1 php-config.1 install-build: @@ -76,10 +75,6 @@ echo program: $(program_prefix)$$prog$(program_suffix); \ $(INSTALL) -m 755 $(builddir)/$$prog $(INSTALL_ROOT)$(bindir)/$(program_prefix)$$prog$(program_suffix); \ done - @for prog in $(bin_src_SCRIPTS); do \ - echo program: $(program_prefix)$$prog$(program_suffix); \ - $(INSTALL) -m 755 $(top_srcdir)/scripts/$$prog $(INSTALL_ROOT)$(bindir)/$(program_prefix)$$prog$(program_suffix); \ - done @echo Installing man pages: $(INSTALL_ROOT)$(mandir)/man1/ @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 @for page in $(man_PAGES); do \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /scripts Makefile.frag
thetaphiMon Jun 6 07:06:23 2005 EDT Modified files: (Branch: PHP_4_4) /php-src/scriptsMakefile.frag Log: MFH: Fix bug #33166 for other branches and new bug #33255, no man pages for 4.4 http://cvs.php.net/diff.php/php-src/scripts/Makefile.frag?r1=1.1.2.11r2=1.1.2.11.2.1ty=u Index: php-src/scripts/Makefile.frag diff -u php-src/scripts/Makefile.frag:1.1.2.11 php-src/scripts/Makefile.frag:1.1.2.11.2.1 --- php-src/scripts/Makefile.frag:1.1.2.11 Sat Apr 30 00:28:24 2005 +++ php-src/scripts/Makefile.frag Mon Jun 6 07:06:22 2005 @@ -21,7 +21,6 @@ config.sub bin_SCRIPTS = phpize php-config -bin_src_SCRIPTS = install-build: @echo Installing build environment: $(INSTALL_ROOT)$(phpbuilddir)/ @@ -63,16 +62,6 @@ echo program: $(program_prefix)$$prog$(program_suffix); \ $(INSTALL) -m 755 $(builddir)/$$prog $(INSTALL_ROOT)$(bindir)/$(program_prefix)$$prog$(program_suffix); \ done - @for prog in $(bin_src_SCRIPTS); do \ - echo program: $(program_prefix)$$prog$(program_suffix); \ - $(INSTALL) -m 755 $(top_srcdir)/scripts/$$prog $(INSTALL_ROOT)$(bindir)/$(program_prefix)$$prog$(program_suffix); \ - done - @echo Installing man pages: $(INSTALL_ROOT)$(mandir)/man1/ - @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 - @for page in $(man_PAGES); do \ - echo page: $$page; \ - $(INSTALL_DATA) $(builddir)/man1/$$page $(INSTALL_ROOT)$(mandir)/man1/$$page; \ - done $(builddir)/phpize: $(srcdir)/phpize.in $(top_builddir)/config.status (CONFIG_FILES=$@ CONFIG_HEADERS= $(top_builddir)/config.status) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/standard md5.c sha1.c
thetaphiSat Apr 16 05:49:56 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/standard md5.c sha1.c
Log:
MFH: use streams api for md5_file() and sha1_file()
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.877r2=1.1247.2.878ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.877 php-src/NEWS:1.1247.2.878
--- php-src/NEWS:1.1247.2.877 Thu Apr 14 11:48:38 2005
+++ php-src/NEWSSat Apr 16 05:49:49 2005
@@ -1,6 +1,7 @@
PHP 4 NEWS
|||
?? ??? 20??, Version 4.?.?
+- Changed sha1_file() / md5_file() to use streams instead of low level IO (Uwe)
- Added the sorting flag SORT_LOCALE_STRING to the sort() functions which makes
them sort based on the current locale. (Derick)
- Fixed bug #32699 (pg_affected_rows() was defined when it was not available).
http://cvs.php.net/diff.php/php-src/ext/standard/md5.c?r1=1.28.4.4r2=1.28.4.5ty=u
Index: php-src/ext/standard/md5.c
diff -u php-src/ext/standard/md5.c:1.28.4.4 php-src/ext/standard/md5.c:1.28.4.5
--- php-src/ext/standard/md5.c:1.28.4.4 Fri Apr 15 05:44:45 2005
+++ php-src/ext/standard/md5.c Sat Apr 16 05:49:53 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: md5.c,v 1.28.4.4 2005/04/15 09:44:45 thetaphi Exp $ */
+/* $Id: md5.c,v 1.28.4.5 2005/04/16 09:49:53 thetaphi Exp $ */
/*
* md5.c - Copyright 1997 Lachlan Roche
@@ -24,9 +24,6 @@
*/
#include php.h
-#include sys/types.h
-#include sys/stat.h
-#include fcntl.h
#include md5.h
PHPAPI void make_digest(char *md5str, unsigned char *digest)
@@ -73,7 +70,8 @@
unsigned char buf[1024];
unsigned char digest[16];
PHP_MD5_CTX context;
- int n,fd;
+ int n;
+ php_stream*stream;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, arg) == FAILURE)
{
WRONG_PARAM_COUNT;
@@ -81,34 +79,25 @@
convert_to_string_ex(arg);
- if (PG(safe_mode) (!php_checkuid(Z_STRVAL_PP(arg), NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
-
- if (php_check_open_basedir(Z_STRVAL_PP(arg) TSRMLS_CC)) {
- RETURN_FALSE;
- }
-
- if ((fd = VCWD_OPEN(Z_STRVAL_PP(arg), O_RDONLY)) == -1) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to open
file);
+ stream = php_stream_open_wrapper(Z_STRVAL_PP(arg), rb, REPORT_ERRORS
| ENFORCE_SAFE_MODE, NULL);
+ if (!stream) {
RETURN_FALSE;
}
PHP_MD5Init(context);
- while ((n = read(fd, buf, sizeof(buf))) 0) {
+ while ((n = php_stream_read(stream, buf, sizeof(buf))) 0) {
PHP_MD5Update(context, buf, n);
}
PHP_MD5Final(digest, context);
+ php_stream_close(stream);
+
if (n0) {
- close(fd);
RETURN_FALSE;
}
- close(fd);
-
make_digest(md5str, digest);
RETVAL_STRING(md5str, 1);
http://cvs.php.net/diff.php/php-src/ext/standard/sha1.c?r1=1.3.4.3r2=1.3.4.4ty=u
Index: php-src/ext/standard/sha1.c
diff -u php-src/ext/standard/sha1.c:1.3.4.3 php-src/ext/standard/sha1.c:1.3.4.4
--- php-src/ext/standard/sha1.c:1.3.4.3 Fri Apr 15 05:24:45 2005
+++ php-src/ext/standard/sha1.c Sat Apr 16 05:49:53 2005
@@ -16,12 +16,9 @@
+--+
*/
-/* $Id: sha1.c,v 1.3.4.3 2005/04/15 09:24:45 thetaphi Exp $ */
+/* $Id: sha1.c,v 1.3.4.4 2005/04/16 09:49:53 thetaphi Exp $ */
#include php.h
-#include sys/types.h
-#include sys/stat.h
-#include fcntl.h
/* This code is heavily based on the PHP md5 implementation */
@@ -72,7 +69,8 @@
unsigned char buf[1024];
unsigned char digest[20];
PHP_SHA1_CTX context;
- int n, fd;
+ int n;
+ php_stream*stream;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, arg) == FAILURE)
{
WRONG_PARAM_COUNT;
@@ -80,34 +78,25 @@
convert_to_string_ex(arg);
- if (PG(safe_mode) (!php_checkuid(Z_STRVAL_PP(arg), NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
-
- if (php_check_open_basedir(Z_STRVAL_PP(arg) TSRMLS_CC)) {
- RETURN_FALSE;
- }
-
- if ((fd = VCWD_OPEN(Z_STRVAL_PP(arg), O_RDONLY)) == -1) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to open
file);
+ stream = php_stream_open_wrapper(Z_STRVAL_PP(arg), rb, REPORT_ERRORS
| ENFORCE_SAFE_MODE, NULL);
+ if (!stream) {
RETURN_FALSE;
}
PHP_SHA1Init(context);
- while ((n = read(fd, buf, sizeof(buf))) 0) {
+ while ((n = php_stream_read(stream, buf, sizeof(buf))) 0) {
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/standard md5.c sha1.c
thetaphiSat Apr 16 05:50:13 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/standard md5.c sha1.c
Log:
MFH: use streams api for md5_file() and sha1_file()
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.324r2=1.1760.2.325ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.324 php-src/NEWS:1.1760.2.325
--- php-src/NEWS:1.1760.2.324 Thu Apr 14 11:48:55 2005
+++ php-src/NEWSSat Apr 16 05:50:12 2005
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? 2005, PHP 5.0.5
+- Changed sha1_file() / md5_file() to use streams instead of low level IO (Uwe)
- Removed php_check_syntax() function, never worked properly. (Ilia)
- Fixed bug #32699 (pg_affected_rows() was defined when it was not available).
(Derick)
http://cvs.php.net/diff.php/php-src/ext/standard/md5.c?r1=1.35.2.1r2=1.35.2.2ty=u
Index: php-src/ext/standard/md5.c
diff -u php-src/ext/standard/md5.c:1.35.2.1 php-src/ext/standard/md5.c:1.35.2.2
--- php-src/ext/standard/md5.c:1.35.2.1 Fri Apr 15 05:14:53 2005
+++ php-src/ext/standard/md5.c Sat Apr 16 05:50:13 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: md5.c,v 1.35.2.1 2005/04/15 09:14:53 thetaphi Exp $ */
+/* $Id: md5.c,v 1.35.2.2 2005/04/16 09:50:13 thetaphi Exp $ */
/*
* md5.c - Copyright 1997 Lachlan Roche
@@ -24,9 +24,6 @@
*/
#include php.h
-#include sys/types.h
-#include sys/stat.h
-#include fcntl.h
#include md5.h
PHPAPI void make_digest(char *md5str, unsigned char *digest)
@@ -81,40 +78,32 @@
unsigned char buf[1024];
unsigned char digest[16];
PHP_MD5_CTX context;
- int n,fd;
+ int n;
+ php_stream*stream;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|b, arg,
arg_len, raw_output) == FAILURE) {
return;
}
-
- if (PG(safe_mode) (!php_checkuid(arg, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
-
- if (php_check_open_basedir(arg TSRMLS_CC)) {
- RETURN_FALSE;
- }
-
- if ((fd = VCWD_OPEN(arg, O_RDONLY)) == -1) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to open
file);
+
+ stream = php_stream_open_wrapper(arg, rb, REPORT_ERRORS |
ENFORCE_SAFE_MODE, NULL);
+ if (!stream) {
RETURN_FALSE;
}
PHP_MD5Init(context);
- while ((n = read(fd, buf, sizeof(buf))) 0) {
+ while ((n = php_stream_read(stream, buf, sizeof(buf))) 0) {
PHP_MD5Update(context, buf, n);
}
PHP_MD5Final(digest, context);
+ php_stream_close(stream);
+
if (n0) {
- close(fd);
RETURN_FALSE;
}
- close(fd);
-
if (raw_output) {
RETURN_STRINGL(digest, 16, 1);
} else {
http://cvs.php.net/diff.php/php-src/ext/standard/sha1.c?r1=1.9.2.1r2=1.9.2.2ty=u
Index: php-src/ext/standard/sha1.c
diff -u php-src/ext/standard/sha1.c:1.9.2.1 php-src/ext/standard/sha1.c:1.9.2.2
--- php-src/ext/standard/sha1.c:1.9.2.1 Fri Apr 15 05:14:53 2005
+++ php-src/ext/standard/sha1.c Sat Apr 16 05:50:13 2005
@@ -16,12 +16,9 @@
+--+
*/
-/* $Id: sha1.c,v 1.9.2.1 2005/04/15 09:14:53 thetaphi Exp $ */
+/* $Id: sha1.c,v 1.9.2.2 2005/04/16 09:50:13 thetaphi Exp $ */
#include php.h
-#include sys/types.h
-#include sys/stat.h
-#include fcntl.h
/* This code is heavily based on the PHP md5 implementation */
@@ -69,6 +66,7 @@
/* }}} */
+
/* {{{ proto string sha1_file(string filename [, bool raw_output])
Calculate the sha1 hash of given filename */
PHP_FUNCTION(sha1_file)
@@ -80,40 +78,32 @@
unsigned char buf[1024];
unsigned char digest[20];
PHP_SHA1_CTX context;
- int n, fd;
+ int n;
+ php_stream*stream;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|b, arg,
arg_len, raw_output) == FAILURE) {
return;
}
-
- if (PG(safe_mode) (!php_checkuid(arg, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
-
- if (php_check_open_basedir(arg TSRMLS_CC)) {
- RETURN_FALSE;
- }
-
- if ((fd = VCWD_OPEN(arg, O_RDONLY)) == -1) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to open
file);
+
+ stream = php_stream_open_wrapper(arg, rb, REPORT_ERRORS |
ENFORCE_SAFE_MODE, NULL);
+ if (!stream) {
RETURN_FALSE;
}
PHP_SHA1Init(context);
- while ((n = read(fd, buf, sizeof(buf))) 0) {
+ while ((n = php_stream_read(stream, buf, sizeof(buf))) 0) {
[PHP-CVS] cvs: php-src /ext/standard md5.c sha1.c
thetaphiFri Apr 15 05:14:38 2005 EDT
Modified files:
/php-src/ext/standard md5.c sha1.c
Log:
fix various solaris problems by replacing stdio with posix io where possible
http://cvs.php.net/diff.php/php-src/ext/standard/md5.c?r1=1.35r2=1.36ty=u
Index: php-src/ext/standard/md5.c
diff -u php-src/ext/standard/md5.c:1.35 php-src/ext/standard/md5.c:1.36
--- php-src/ext/standard/md5.c:1.35 Thu Jan 8 03:17:33 2004
+++ php-src/ext/standard/md5.c Fri Apr 15 05:14:38 2005
@@ -16,16 +16,17 @@
+--+
*/
-/* $Id: md5.c,v 1.35 2004/01/08 08:17:33 andi Exp $ */
+/* $Id: md5.c,v 1.36 2005/04/15 09:14:38 thetaphi Exp $ */
/*
* md5.c - Copyright 1997 Lachlan Roche
* md5_file() added by Alessandro Astarita [EMAIL PROTECTED]
*/
-#include stdio.h
#include php.h
-
+#include sys/types.h
+#include sys/stat.h
+#include fcntl.h
#include md5.h
PHPAPI void make_digest(char *md5str, unsigned char *digest)
@@ -80,8 +81,7 @@
unsigned char buf[1024];
unsigned char digest[16];
PHP_MD5_CTX context;
- int n;
- FILE *fp;
+ int n,fd;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|b, arg,
arg_len, raw_output) == FAILURE) {
return;
@@ -95,25 +95,25 @@
RETURN_FALSE;
}
- if ((fp = VCWD_FOPEN(arg, rb)) == NULL) {
+ if ((fd = VCWD_OPEN(arg, O_RDONLY)) == -1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to open
file);
RETURN_FALSE;
}
PHP_MD5Init(context);
- while ((n = fread(buf, 1, sizeof(buf), fp)) 0) {
+ while ((n = read(fd, buf, sizeof(buf))) 0) {
PHP_MD5Update(context, buf, n);
}
PHP_MD5Final(digest, context);
- if (ferror(fp)) {
- fclose(fp);
+ if (n0) {
+ close(fd);
RETURN_FALSE;
}
- fclose(fp);
+ close(fd);
if (raw_output) {
RETURN_STRINGL(digest, 16, 1);
http://cvs.php.net/diff.php/php-src/ext/standard/sha1.c?r1=1.9r2=1.10ty=u
Index: php-src/ext/standard/sha1.c
diff -u php-src/ext/standard/sha1.c:1.9 php-src/ext/standard/sha1.c:1.10
--- php-src/ext/standard/sha1.c:1.9 Thu Jan 8 03:17:34 2004
+++ php-src/ext/standard/sha1.c Fri Apr 15 05:14:38 2005
@@ -16,10 +16,12 @@
+--+
*/
-/* $Id: sha1.c,v 1.9 2004/01/08 08:17:34 andi Exp $ */
+/* $Id: sha1.c,v 1.10 2005/04/15 09:14:38 thetaphi Exp $ */
-#include stdio.h
#include php.h
+#include sys/types.h
+#include sys/stat.h
+#include fcntl.h
/* This code is heavily based on the PHP md5 implementation */
@@ -78,8 +80,7 @@
unsigned char buf[1024];
unsigned char digest[20];
PHP_SHA1_CTX context;
- int n;
- FILE *fp;
+ int n, fd;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|b, arg,
arg_len, raw_output) == FAILURE) {
return;
@@ -93,25 +94,25 @@
RETURN_FALSE;
}
- if ((fp = VCWD_FOPEN(arg, rb)) == NULL) {
+ if ((fd = VCWD_OPEN(arg, O_RDONLY)) == -1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to open
file);
RETURN_FALSE;
}
PHP_SHA1Init(context);
- while ((n = fread(buf, 1, sizeof(buf), fp)) 0) {
+ while ((n = read(fd, buf, sizeof(buf))) 0) {
PHP_SHA1Update(context, buf, n);
}
PHP_SHA1Final(digest, context);
- if (ferror(fp)) {
- fclose(fp);
+ if (n0) {
+ close(fd);
RETURN_FALSE;
}
- fclose(fp);
+ close(fd);
if (raw_output) {
RETURN_STRINGL(digest, 20, 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard md5.c sha1.c
thetaphiFri Apr 15 05:14:53 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard md5.c sha1.c
Log:
MFH: fix various solaris problems by replacing stdio with posix io where
possible
http://cvs.php.net/diff.php/php-src/ext/standard/md5.c?r1=1.35r2=1.35.2.1ty=u
Index: php-src/ext/standard/md5.c
diff -u php-src/ext/standard/md5.c:1.35 php-src/ext/standard/md5.c:1.35.2.1
--- php-src/ext/standard/md5.c:1.35 Thu Jan 8 03:17:33 2004
+++ php-src/ext/standard/md5.c Fri Apr 15 05:14:53 2005
@@ -16,16 +16,17 @@
+--+
*/
-/* $Id: md5.c,v 1.35 2004/01/08 08:17:33 andi Exp $ */
+/* $Id: md5.c,v 1.35.2.1 2005/04/15 09:14:53 thetaphi Exp $ */
/*
* md5.c - Copyright 1997 Lachlan Roche
* md5_file() added by Alessandro Astarita [EMAIL PROTECTED]
*/
-#include stdio.h
#include php.h
-
+#include sys/types.h
+#include sys/stat.h
+#include fcntl.h
#include md5.h
PHPAPI void make_digest(char *md5str, unsigned char *digest)
@@ -80,8 +81,7 @@
unsigned char buf[1024];
unsigned char digest[16];
PHP_MD5_CTX context;
- int n;
- FILE *fp;
+ int n,fd;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|b, arg,
arg_len, raw_output) == FAILURE) {
return;
@@ -95,25 +95,25 @@
RETURN_FALSE;
}
- if ((fp = VCWD_FOPEN(arg, rb)) == NULL) {
+ if ((fd = VCWD_OPEN(arg, O_RDONLY)) == -1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to open
file);
RETURN_FALSE;
}
PHP_MD5Init(context);
- while ((n = fread(buf, 1, sizeof(buf), fp)) 0) {
+ while ((n = read(fd, buf, sizeof(buf))) 0) {
PHP_MD5Update(context, buf, n);
}
PHP_MD5Final(digest, context);
- if (ferror(fp)) {
- fclose(fp);
+ if (n0) {
+ close(fd);
RETURN_FALSE;
}
- fclose(fp);
+ close(fd);
if (raw_output) {
RETURN_STRINGL(digest, 16, 1);
http://cvs.php.net/diff.php/php-src/ext/standard/sha1.c?r1=1.9r2=1.9.2.1ty=u
Index: php-src/ext/standard/sha1.c
diff -u php-src/ext/standard/sha1.c:1.9 php-src/ext/standard/sha1.c:1.9.2.1
--- php-src/ext/standard/sha1.c:1.9 Thu Jan 8 03:17:34 2004
+++ php-src/ext/standard/sha1.c Fri Apr 15 05:14:53 2005
@@ -16,10 +16,12 @@
+--+
*/
-/* $Id: sha1.c,v 1.9 2004/01/08 08:17:34 andi Exp $ */
+/* $Id: sha1.c,v 1.9.2.1 2005/04/15 09:14:53 thetaphi Exp $ */
-#include stdio.h
#include php.h
+#include sys/types.h
+#include sys/stat.h
+#include fcntl.h
/* This code is heavily based on the PHP md5 implementation */
@@ -78,8 +80,7 @@
unsigned char buf[1024];
unsigned char digest[20];
PHP_SHA1_CTX context;
- int n;
- FILE *fp;
+ int n, fd;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|b, arg,
arg_len, raw_output) == FAILURE) {
return;
@@ -93,25 +94,25 @@
RETURN_FALSE;
}
- if ((fp = VCWD_FOPEN(arg, rb)) == NULL) {
+ if ((fd = VCWD_OPEN(arg, O_RDONLY)) == -1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to open
file);
RETURN_FALSE;
}
PHP_SHA1Init(context);
- while ((n = fread(buf, 1, sizeof(buf), fp)) 0) {
+ while ((n = read(fd, buf, sizeof(buf))) 0) {
PHP_SHA1Update(context, buf, n);
}
PHP_SHA1Final(digest, context);
- if (ferror(fp)) {
- fclose(fp);
+ if (n0) {
+ close(fd);
RETURN_FALSE;
}
- fclose(fp);
+ close(fd);
if (raw_output) {
RETURN_STRINGL(digest, 20, 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard md5.c sha1.c
thetaphiFri Apr 15 05:15:04 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard md5.c sha1.c
Log:
MFH: fix various solaris problems by replacing stdio with posix io where
possible
http://cvs.php.net/diff.php/php-src/ext/standard/md5.c?r1=1.28.4.1r2=1.28.4.2ty=u
Index: php-src/ext/standard/md5.c
diff -u php-src/ext/standard/md5.c:1.28.4.1 php-src/ext/standard/md5.c:1.28.4.2
--- php-src/ext/standard/md5.c:1.28.4.1 Tue Dec 31 11:35:31 2002
+++ php-src/ext/standard/md5.c Fri Apr 15 05:15:03 2005
@@ -16,16 +16,17 @@
+--+
*/
-/* $Id: md5.c,v 1.28.4.1 2002/12/31 16:35:31 sebastian Exp $ */
+/* $Id: md5.c,v 1.28.4.2 2005/04/15 09:15:03 thetaphi Exp $ */
/*
* md5.c - Copyright 1997 Lachlan Roche
* md5_file() added by Alessandro Astarita [EMAIL PROTECTED]
*/
-#include stdio.h
#include php.h
-
+#include sys/types.h
+#include sys/stat.h
+#include fcntl.h
#include md5.h
PHPAPI void make_digest(char *md5str, unsigned char *digest)
@@ -72,8 +73,7 @@
unsigned char buf[1024];
unsigned char digest[16];
PHP_MD5_CTX context;
- int n;
- FILE *fp;
+ int n,fd;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, arg) == FAILURE)
{
WRONG_PARAM_COUNT;
@@ -89,24 +89,26 @@
RETURN_FALSE;
}
- if ((fp = VCWD_FOPEN(Z_STRVAL_PP(arg), rb)) == NULL) {
+ if ((fd = VCWD_OPEN(arg, O_RDONLY)) == -1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to open
file);
RETURN_FALSE;
}
PHP_MD5Init(context);
- while ((n = fread(buf, 1, sizeof(buf), fp)) 0) {
+ while ((n = read(fd, buf, sizeof(buf))) 0) {
PHP_MD5Update(context, buf, n);
}
PHP_MD5Final(digest, context);
- if (ferror(fp)) {
- fclose(fp);
+ if (n0) {
+ close(fd);
RETURN_FALSE;
}
+ close(fd);
+
fclose(fp);
make_digest(md5str, digest);
http://cvs.php.net/diff.php/php-src/ext/standard/sha1.c?r1=1.3.4.1r2=1.3.4.2ty=u
Index: php-src/ext/standard/sha1.c
diff -u php-src/ext/standard/sha1.c:1.3.4.1 php-src/ext/standard/sha1.c:1.3.4.2
--- php-src/ext/standard/sha1.c:1.3.4.1 Tue Dec 31 11:35:34 2002
+++ php-src/ext/standard/sha1.c Fri Apr 15 05:15:03 2005
@@ -16,10 +16,12 @@
+--+
*/
-/* $Id: sha1.c,v 1.3.4.1 2002/12/31 16:35:34 sebastian Exp $ */
+/* $Id: sha1.c,v 1.3.4.2 2005/04/15 09:15:03 thetaphi Exp $ */
-#include stdio.h
#include php.h
+#include sys/types.h
+#include sys/stat.h
+#include fcntl.h
/* This code is heavily based on the PHP md5 implementation */
@@ -70,8 +72,7 @@
unsigned char buf[1024];
unsigned char digest[20];
PHP_SHA1_CTX context;
- int n;
- FILE *fp;
+ int n, fd;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, arg) == FAILURE)
{
WRONG_PARAM_COUNT;
@@ -87,25 +88,25 @@
RETURN_FALSE;
}
- if ((fp = VCWD_FOPEN(Z_STRVAL_PP(arg), rb)) == NULL) {
+ if ((fd = VCWD_OPEN(arg, O_RDONLY)) == -1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to open
file);
RETURN_FALSE;
}
PHP_SHA1Init(context);
- while ((n = fread(buf, 1, sizeof(buf), fp)) 0) {
+ while ((n = read(fd, buf, sizeof(buf))) 0) {
PHP_SHA1Update(context, buf, n);
}
PHP_SHA1Final(digest, context);
- if (ferror(fp)) {
- fclose(fp);
+ if (n0) {
+ close(fd);
RETURN_FALSE;
}
- fclose(fp);
+ close(fd);
make_sha1_digest(sha1str, digest);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard md5.c sha1.c
thetaphiFri Apr 15 05:24:45 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard md5.c sha1.c
Log:
correct copy/paste problem
http://cvs.php.net/diff.php/php-src/ext/standard/md5.c?r1=1.28.4.2r2=1.28.4.3ty=u
Index: php-src/ext/standard/md5.c
diff -u php-src/ext/standard/md5.c:1.28.4.2 php-src/ext/standard/md5.c:1.28.4.3
--- php-src/ext/standard/md5.c:1.28.4.2 Fri Apr 15 05:15:03 2005
+++ php-src/ext/standard/md5.c Fri Apr 15 05:24:45 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: md5.c,v 1.28.4.2 2005/04/15 09:15:03 thetaphi Exp $ */
+/* $Id: md5.c,v 1.28.4.3 2005/04/15 09:24:45 thetaphi Exp $ */
/*
* md5.c - Copyright 1997 Lachlan Roche
@@ -89,7 +89,7 @@
RETURN_FALSE;
}
- if ((fd = VCWD_OPEN(arg, O_RDONLY)) == -1) {
+ if ((fd = VCWD_OPEN(Z_STRVAL_PP(arg), O_RDONLY)) == -1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to open
file);
RETURN_FALSE;
}
http://cvs.php.net/diff.php/php-src/ext/standard/sha1.c?r1=1.3.4.2r2=1.3.4.3ty=u
Index: php-src/ext/standard/sha1.c
diff -u php-src/ext/standard/sha1.c:1.3.4.2 php-src/ext/standard/sha1.c:1.3.4.3
--- php-src/ext/standard/sha1.c:1.3.4.2 Fri Apr 15 05:15:03 2005
+++ php-src/ext/standard/sha1.c Fri Apr 15 05:24:45 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sha1.c,v 1.3.4.2 2005/04/15 09:15:03 thetaphi Exp $ */
+/* $Id: sha1.c,v 1.3.4.3 2005/04/15 09:24:45 thetaphi Exp $ */
#include php.h
#include sys/types.h
@@ -88,7 +88,7 @@
RETURN_FALSE;
}
- if ((fd = VCWD_OPEN(arg, O_RDONLY)) == -1) {
+ if ((fd = VCWD_OPEN(Z_STRVAL_PP(arg), O_RDONLY)) == -1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to open
file);
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard md5.c
thetaphiFri Apr 15 05:44:45 2005 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/standard md5.c Log: correct copy/paste problem http://cvs.php.net/diff.php/php-src/ext/standard/md5.c?r1=1.28.4.3r2=1.28.4.4ty=u Index: php-src/ext/standard/md5.c diff -u php-src/ext/standard/md5.c:1.28.4.3 php-src/ext/standard/md5.c:1.28.4.4 --- php-src/ext/standard/md5.c:1.28.4.3 Fri Apr 15 05:24:45 2005 +++ php-src/ext/standard/md5.c Fri Apr 15 05:44:45 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: md5.c,v 1.28.4.3 2005/04/15 09:24:45 thetaphi Exp $ */ +/* $Id: md5.c,v 1.28.4.4 2005/04/15 09:44:45 thetaphi Exp $ */ /* * md5.c - Copyright 1997 Lachlan Roche @@ -109,8 +109,6 @@ close(fd); - fclose(fp); - make_digest(md5str, digest); RETVAL_STRING(md5str, 1); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard md5.c sha1.c
thetaphiFri Apr 15 10:29:32 2005 EDT
Modified files:
/php-src/ext/standard md5.c sha1.c
Log:
use streams api for md5_file and sha1_file. Added parameter use_include_path
similar to other PHP file functions. Documentation update outstanding
http://cvs.php.net/diff.php/php-src/ext/standard/md5.c?r1=1.36r2=1.37ty=u
Index: php-src/ext/standard/md5.c
diff -u php-src/ext/standard/md5.c:1.36 php-src/ext/standard/md5.c:1.37
--- php-src/ext/standard/md5.c:1.36 Fri Apr 15 05:14:38 2005
+++ php-src/ext/standard/md5.c Fri Apr 15 10:29:32 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: md5.c,v 1.36 2005/04/15 09:14:38 thetaphi Exp $ */
+/* $Id: md5.c,v 1.37 2005/04/15 14:29:32 thetaphi Exp $ */
/*
* md5.c - Copyright 1997 Lachlan Roche
@@ -24,9 +24,6 @@
*/
#include php.h
-#include sys/types.h
-#include sys/stat.h
-#include fcntl.h
#include md5.h
PHPAPI void make_digest(char *md5str, unsigned char *digest)
@@ -70,51 +67,45 @@
}
/* }}} */
-/* {{{ proto string md5_file(string filename [, bool raw_output])
+/* {{{ proto string md5_file(string filename [, bool raw_output [, bool
use_include_path]])
Calculate the md5 hash of given filename */
PHP_NAMED_FUNCTION(php_if_md5_file)
{
char *arg;
int arg_len;
zend_bool raw_output = 0;
+ zend_bool use_include_path = 0;
char md5str[33];
unsigned char buf[1024];
unsigned char digest[16];
PHP_MD5_CTX context;
- int n,fd;
+ int n;
+ php_stream*stream;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|b, arg,
arg_len, raw_output) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|bb, arg,
arg_len, raw_output, use_include_path) == FAILURE) {
return;
}
-
- if (PG(safe_mode) (!php_checkuid(arg, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
-
- if (php_check_open_basedir(arg TSRMLS_CC)) {
- RETURN_FALSE;
- }
-
- if ((fd = VCWD_OPEN(arg, O_RDONLY)) == -1) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to open
file);
+
+ stream = php_stream_open_wrapper(arg, rb,
+ (use_include_path ? USE_PATH : 0) | REPORT_ERRORS |
ENFORCE_SAFE_MODE, NULL);
+ if (!stream) {
RETURN_FALSE;
}
PHP_MD5Init(context);
- while ((n = read(fd, buf, sizeof(buf))) 0) {
+ while ((n = php_stream_read(stream, buf, sizeof(buf))) 0) {
PHP_MD5Update(context, buf, n);
}
PHP_MD5Final(digest, context);
+ php_stream_close(stream);
+
if (n0) {
- close(fd);
RETURN_FALSE;
}
- close(fd);
-
if (raw_output) {
RETURN_STRINGL(digest, 16, 1);
} else {
http://cvs.php.net/diff.php/php-src/ext/standard/sha1.c?r1=1.10r2=1.11ty=u
Index: php-src/ext/standard/sha1.c
diff -u php-src/ext/standard/sha1.c:1.10 php-src/ext/standard/sha1.c:1.11
--- php-src/ext/standard/sha1.c:1.10Fri Apr 15 05:14:38 2005
+++ php-src/ext/standard/sha1.c Fri Apr 15 10:29:32 2005
@@ -16,12 +16,9 @@
+--+
*/
-/* $Id: sha1.c,v 1.10 2005/04/15 09:14:38 thetaphi Exp $ */
+/* $Id: sha1.c,v 1.11 2005/04/15 14:29:32 thetaphi Exp $ */
#include php.h
-#include sys/types.h
-#include sys/stat.h
-#include fcntl.h
/* This code is heavily based on the PHP md5 implementation */
@@ -69,51 +66,46 @@
/* }}} */
-/* {{{ proto string sha1_file(string filename [, bool raw_output])
+
+/* {{{ proto string sha1_file(string filename [, bool raw_output [, bool
use_include_path]])
Calculate the sha1 hash of given filename */
PHP_FUNCTION(sha1_file)
{
char *arg;
int arg_len;
zend_bool raw_output = 0;
+ zend_bool use_include_path = 0;
char sha1str[41];
unsigned char buf[1024];
unsigned char digest[20];
PHP_SHA1_CTX context;
- int n, fd;
+ int n;
+ php_stream*stream;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|b, arg,
arg_len, raw_output) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|bb, arg,
arg_len, raw_output, use_include_path) == FAILURE) {
return;
}
-
- if (PG(safe_mode) (!php_checkuid(arg, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
-
- if (php_check_open_basedir(arg TSRMLS_CC)) {
- RETURN_FALSE;
- }
-
- if ((fd = VCWD_OPEN(arg, O_RDONLY)) == -1) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to open
file);
+
+ stream =
[PHP-CVS] cvs: php-src / NEWS /ext/standard md5.c sha1.c
thetaphiFri Apr 15 13:13:55 2005 EDT
Modified files:
/php-srcNEWS
/php-src/ext/standard md5.c sha1.c
Log:
Remove include_path support from md5_file/sha1_file again
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1869r2=1.1870ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1869 php-src/NEWS:1.1870
--- php-src/NEWS:1.1869 Sun Apr 10 17:45:25 2005
+++ php-src/NEWSFri Apr 15 13:13:52 2005
@@ -47,6 +47,7 @@
. pg_result_error_field() - highly detailed error information,
most importantly the SQLSTATE error code.
. pg_set_error_verbosity() - set verbosity of errors.
+- Changed sha1_file() / md5_file() to use streams instead of low level IO (Uwe)
- Added optional fifth parameter count to preg_replace_callback() and
preg_replace() to count the number of replacements made. FR #32275. (Andrey)
- Added optional third parameter charlist to str_word_count() which
http://cvs.php.net/diff.php/php-src/ext/standard/md5.c?r1=1.37r2=1.38ty=u
Index: php-src/ext/standard/md5.c
diff -u php-src/ext/standard/md5.c:1.37 php-src/ext/standard/md5.c:1.38
--- php-src/ext/standard/md5.c:1.37 Fri Apr 15 10:29:32 2005
+++ php-src/ext/standard/md5.c Fri Apr 15 13:13:54 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: md5.c,v 1.37 2005/04/15 14:29:32 thetaphi Exp $ */
+/* $Id: md5.c,v 1.38 2005/04/15 17:13:54 thetaphi Exp $ */
/*
* md5.c - Copyright 1997 Lachlan Roche
@@ -67,14 +67,13 @@
}
/* }}} */
-/* {{{ proto string md5_file(string filename [, bool raw_output [, bool
use_include_path]])
+/* {{{ proto string md5_file(string filename [, bool raw_output])
Calculate the md5 hash of given filename */
PHP_NAMED_FUNCTION(php_if_md5_file)
{
char *arg;
int arg_len;
zend_bool raw_output = 0;
- zend_bool use_include_path = 0;
char md5str[33];
unsigned char buf[1024];
unsigned char digest[16];
@@ -82,12 +81,11 @@
int n;
php_stream*stream;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|bb, arg,
arg_len, raw_output, use_include_path) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|b, arg,
arg_len, raw_output) == FAILURE) {
return;
}
- stream = php_stream_open_wrapper(arg, rb,
- (use_include_path ? USE_PATH : 0) | REPORT_ERRORS |
ENFORCE_SAFE_MODE, NULL);
+ stream = php_stream_open_wrapper(arg, rb, REPORT_ERRORS |
ENFORCE_SAFE_MODE, NULL);
if (!stream) {
RETURN_FALSE;
}
http://cvs.php.net/diff.php/php-src/ext/standard/sha1.c?r1=1.11r2=1.12ty=u
Index: php-src/ext/standard/sha1.c
diff -u php-src/ext/standard/sha1.c:1.11 php-src/ext/standard/sha1.c:1.12
--- php-src/ext/standard/sha1.c:1.11Fri Apr 15 10:29:32 2005
+++ php-src/ext/standard/sha1.c Fri Apr 15 13:13:54 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sha1.c,v 1.11 2005/04/15 14:29:32 thetaphi Exp $ */
+/* $Id: sha1.c,v 1.12 2005/04/15 17:13:54 thetaphi Exp $ */
#include php.h
@@ -67,14 +67,13 @@
/* }}} */
-/* {{{ proto string sha1_file(string filename [, bool raw_output [, bool
use_include_path]])
+/* {{{ proto string sha1_file(string filename [, bool raw_output])
Calculate the sha1 hash of given filename */
PHP_FUNCTION(sha1_file)
{
char *arg;
int arg_len;
zend_bool raw_output = 0;
- zend_bool use_include_path = 0;
char sha1str[41];
unsigned char buf[1024];
unsigned char digest[20];
@@ -82,12 +81,11 @@
int n;
php_stream*stream;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|bb, arg,
arg_len, raw_output, use_include_path) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|b, arg,
arg_len, raw_output) == FAILURE) {
return;
}
- stream = php_stream_open_wrapper(arg, rb,
- (use_include_path ? USE_PATH : 0) | REPORT_ERRORS |
ENFORCE_SAFE_MODE, NULL);
+ stream = php_stream_open_wrapper(arg, rb, REPORT_ERRORS |
ENFORCE_SAFE_MODE, NULL);
if (!stream) {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /main streams.c
thetaphiThu Apr 7 03:28:08 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/main streams.c
Log:
Bug #32614 - prevent from crahsing with segfault on solaris if fdopen() fails
- this fixes NOT the stdio-problem on solaris!
http://cvs.php.net/diff.php/php-src/main/streams.c?r1=1.125.2.94r2=1.125.2.95ty=u
Index: php-src/main/streams.c
diff -u php-src/main/streams.c:1.125.2.94 php-src/main/streams.c:1.125.2.95
--- php-src/main/streams.c:1.125.2.94 Mon Apr 4 16:26:49 2005
+++ php-src/main/streams.c Thu Apr 7 03:28:08 2005
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: streams.c,v 1.125.2.94 2005/04/04 20:26:49 pollita Exp $ */
+/* $Id: streams.c,v 1.125.2.95 2005/04/07 07:28:08 thetaphi Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -1595,6 +1595,9 @@
if (ret) {
if (data-file == NULL) {
data-file = fdopen(data-fd,
stream-mode);
+ if (data-file == NULL) {
+ return FAILURE;
+ }
}
*(FILE**)ret = data-file;
data-fd = -1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /main rfc1867.c
thetaphiMon Apr 4 10:59:41 2005 EDT
Modified files:
/php-srcNEWS
/php-src/main rfc1867.c
Log:
Bug #32491 (File upload error - unable to create a temporary file) - Changing
file upload from stdio to posix
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1863r2=1.1864ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1863 php-src/NEWS:1.1864
--- php-src/NEWS:1.1863 Mon Apr 4 03:15:59 2005
+++ php-src/NEWSMon Apr 4 10:59:38 2005
@@ -96,6 +96,8 @@
- Fixed bug with raw_post_data not getting set. (Brian)
- Fixed bug in mysql::client_version(). (Georg)
- Fixed ZTS destruction. (Marcus)
+- Fixed bug #32491 (File upload error - unable to create a temporary file).
+ (Uwe Schindler)
- Fixed bug #32109 ($_POST is not populated in multithreaded environment).
(Moriyoshi)
- Fixed bug #31478 (segfault with empty() / isset()). (Moriyoshi)
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.170r2=1.171ty=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.170 php-src/main/rfc1867.c:1.171
--- php-src/main/rfc1867.c:1.170Mon Feb 14 19:25:38 2005
+++ php-src/main/rfc1867.c Mon Apr 4 10:59:40 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: rfc1867.c,v 1.170 2005/02/15 00:25:38 iliaa Exp $ */
+/* $Id: rfc1867.c,v 1.171 2005/04/04 14:59:40 thetaphi Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -784,7 +784,7 @@
zend_bool magic_quotes_gpc;
multipart_buffer *mbuff;
zval *array_ptr = (zval *) arg;
- FILE *fp;
+ int fd=-1;
zend_llist header;
if (SG(request_info).content_length SG(post_max_size)) {
@@ -969,8 +969,8 @@
if (!skip_upload) {
/* Handle file */
- fp =
php_open_temporary_file(PG(upload_tmp_dir), php, temp_filename TSRMLS_CC);
- if (!fp) {
+ fd = php_open_temporary_fd(PG(upload_tmp_dir),
php, temp_filename TSRMLS_CC);
+ if (fd==-1) {
sapi_module.sapi_error(E_WARNING, File
upload error - unable to create a temporary file);
cancel_upload = UPLOAD_ERROR_E;
}
@@ -1001,7 +1001,7 @@
#endif
cancel_upload = UPLOAD_ERROR_B;
} else if (blen 0) {
- wlen = fwrite(buff, 1, blen, fp);
+ wlen = write(fd, buff, blen);
if (wlen blen) {
#if DEBUG_FILE_UPLOAD
@@ -1013,8 +1013,8 @@
}
}
}
- if (fp) { /* may not be initialized if file could not
be created */
- fclose(fp);
+ if (fd!=-1) { /* may not be initialized if file could
not be created */
+ close(fd);
}
#if DEBUG_FILE_UPLOAD
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /main rfc1867.c
thetaphiMon Apr 4 10:59:58 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/main rfc1867.c
Log:
Bug #32491 (File upload error - unable to create a temporary file) - Changing
file upload from stdio to posix
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.868r2=1.1247.2.869ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.868 php-src/NEWS:1.1247.2.869
--- php-src/NEWS:1.1247.2.868 Sun Apr 3 14:09:55 2005
+++ php-src/NEWSMon Apr 4 10:59:56 2005
@@ -7,6 +7,8 @@
(adam dot greenfield at gmail dot com)
- Fixed bug #32530 (chunk_split() does not append endstr if chunklen is
longer then the original string). (Ilia)
+- Fixed bug #32491 (File upload error - unable to create a temporary file).
+ (Uwe Schindler)
31 Mar 2005, Version 4.3.11
- Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.122.2.33r2=1.122.2.34ty=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.122.2.33 php-src/main/rfc1867.c:1.122.2.34
--- php-src/main/rfc1867.c:1.122.2.33 Mon Feb 14 19:28:39 2005
+++ php-src/main/rfc1867.c Mon Apr 4 10:59:58 2005
@@ -16,7 +16,7 @@
| Jani Taskinen [EMAIL PROTECTED] |
+--+
*/
-/* $Id: rfc1867.c,v 1.122.2.33 2005/02/15 00:28:39 iliaa Exp $ */
+/* $Id: rfc1867.c,v 1.122.2.34 2005/04/04 14:59:58 thetaphi Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -779,7 +779,7 @@
zend_bool magic_quotes_gpc;
multipart_buffer *mbuff;
zval *array_ptr = (zval *) arg;
- FILE *fp;
+ int fd=-1;
zend_llist header;
if (SG(request_info).content_length SG(post_max_size)) {
@@ -962,8 +962,8 @@
if (!skip_upload) {
/* Handle file */
- fp =
php_open_temporary_file(PG(upload_tmp_dir), php, temp_filename TSRMLS_CC);
- if (!fp) {
+ fd = php_open_temporary_fd(PG(upload_tmp_dir),
php, temp_filename TSRMLS_CC);
+ if (fd==-1) {
sapi_module.sapi_error(E_WARNING, File
upload error - unable to create a temporary file);
cancel_upload = UPLOAD_ERROR_E;
}
@@ -990,7 +990,7 @@
sapi_module.sapi_error(E_WARNING,
MAX_FILE_SIZE of %ld bytes exceeded - file [%s=%s] not saved, max_file_size,
param, filename);
cancel_upload = UPLOAD_ERROR_B;
} else if (blen 0) {
- wlen = fwrite(buff, 1, blen, fp);
+ wlen = write(fd, buff, blen);
if (wlen blen) {
sapi_module.sapi_error(E_WARNING, Only %d bytes were written, expected to
write %d, wlen, blen);
@@ -1000,8 +1000,8 @@
}
}
}
- if (fp) {
- fclose(fp);
+ if (fd!=-1) {
+ close(fd);
}
#ifdef DEBUG_FILE_UPLOAD
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
thetaphiSun Apr 3 15:16:23 2005 EDT
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
Add sapi.get_request_time() to NSAPI
http://cvs.php.net/diff.php/php-src/sapi/nsapi/nsapi.c?r1=1.66r2=1.67ty=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.66 php-src/sapi/nsapi/nsapi.c:1.67
--- php-src/sapi/nsapi/nsapi.c:1.66 Mon Dec 20 14:33:39 2004
+++ php-src/sapi/nsapi/nsapi.c Sun Apr 3 15:16:23 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.66 2004/12/20 19:33:39 rasmus Exp $ */
+/* $Id: nsapi.c,v 1.67 2005/04/03 19:16:23 thetaphi 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.66
$);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.67
$);
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 );
@@ -708,6 +708,11 @@
log_error(LOG_INFORM, pblock_findval(fn, rc-pb), rc-sn, rc-rq,
%s, message);
}
+static time_t sapi_nsapi_get_request_time(TSRMLS_D)
+{
+ return REQ_TIME( ((nsapi_request_context *)SG(server_context))-rq );
+}
+
static int php_nsapi_startup(sapi_module_struct *sapi_module)
{
if (php_module_startup(sapi_module, nsapi_module_entry, 1)==FAILURE) {
@@ -743,7 +748,7 @@
sapi_nsapi_register_server_variables, /* register server variables */
nsapi_log_message, /* Log message */
- NULL,
/* Get request time */
+ sapi_nsapi_get_request_time,/* Get request time */
NULL, /* Block interruptions */
NULL, /* Unblock interruptions */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /sapi/nsapi nsapi.c
thetaphiTue Sep 21 18:00:39 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/sapi/nsapi nsapi.c
Log:
Fixed bug #29805 (HTTP Authentication Issues)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.730r2=1.1247.2.731ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.730 php-src/NEWS:1.1247.2.731
--- php-src/NEWS:1.1247.2.730 Mon Sep 20 18:27:55 2004
+++ php-src/NEWSTue Sep 21 18:00:38 2004
@@ -1,5 +1,8 @@
PHP 4 NEWS
|||
+?? ??? 2004, Version 4.3.10
+- Fixed bug #29805 (HTTP Authentication Issues). (Uwe Schindler)
+
22 Sep 2004, Version 4.3.9
- GPC input processing fixes (Stefano Di Paola, Rasmus, Stefan)
- Implemented periodic PCRE compiled regexp cache cleanup, to avoid memory
http://cvs.php.net/diff.php/php-src/sapi/nsapi/nsapi.c?r1=1.28.2.31r2=1.28.2.32ty=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.28.2.31 php-src/sapi/nsapi/nsapi.c:1.28.2.32
--- php-src/sapi/nsapi/nsapi.c:1.28.2.31Wed Sep 15 17:51:29 2004
+++ php-src/sapi/nsapi/nsapi.c Tue Sep 21 18:00:39 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.28.2.31 2004/09/15 21:51:29 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.28.2.32 2004/09/21 22:00:39 thetaphi 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.28.2.31 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.28.2.32 $);
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 );
@@ -934,6 +934,8 @@
SG(sapi_headers).http_response_code = (error_directive) ? rq-status_num : 200;
nsapi_php_ini_entries(NSLS_C TSRMLS_CC);
+
+ if (!PG(safe_mode)) php_handle_auth_data(pblock_findval(authorization,
rq-headers) TSRMLS_CC);
file_handle.type = ZEND_HANDLE_FILENAME;
file_handle.filename = SG(request_info).path_translated;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /sapi/nsapi nsapi.c
thetaphiMon Sep 20 09:29:45 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/sapi/nsapi nsapi.c
Log:
changed order of processing of ini entries
http://cvs.php.net/diff.php/php-src/sapi/nsapi/nsapi.c?r1=1.63.2.1r2=1.63.2.2ty=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.63.2.1 php-src/sapi/nsapi/nsapi.c:1.63.2.2
--- php-src/sapi/nsapi/nsapi.c:1.63.2.1 Wed Sep 15 17:27:10 2004
+++ php-src/sapi/nsapi/nsapi.c Mon Sep 20 09:29:44 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.63.2.1 2004/09/15 21:27:10 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.63.2.2 2004/09/20 13:29:44 thetaphi 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.63.2.1 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.63.2.2 $);
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 );
@@ -933,9 +933,9 @@
SG(request_info).content_length = (content_length == NULL) ? 0 :
strtoul(content_length, 0, 0);
SG(sapi_headers).http_response_code = (error_directive) ? rq-status_num : 200;
- if (!PG(safe_mode)) php_handle_auth_data(pblock_findval(authorization,
rq-headers) TSRMLS_CC);
-
nsapi_php_ini_entries(NSLS_C TSRMLS_CC);
+
+ if (!PG(safe_mode)) php_handle_auth_data(pblock_findval(authorization,
rq-headers) TSRMLS_CC);
file_handle.type = ZEND_HANDLE_FILENAME;
file_handle.filename = SG(request_info).path_translated;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
thetaphiMon Sep 20 09:30:13 2004 EDT
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
changed order of processing of ini entries
http://cvs.php.net/diff.php/php-src/sapi/nsapi/nsapi.c?r1=1.64r2=1.65ty=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.64 php-src/sapi/nsapi/nsapi.c:1.65
--- php-src/sapi/nsapi/nsapi.c:1.64 Wed Sep 15 17:28:30 2004
+++ php-src/sapi/nsapi/nsapi.c Mon Sep 20 09:30:13 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.64 2004/09/15 21:28:30 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.65 2004/09/20 13:30:13 thetaphi 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.64 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.65 $);
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 );
@@ -933,9 +933,9 @@
SG(request_info).content_length = (content_length == NULL) ? 0 :
strtoul(content_length, 0, 0);
SG(sapi_headers).http_response_code = (error_directive) ? rq-status_num : 200;
- if (!PG(safe_mode)) php_handle_auth_data(pblock_findval(authorization,
rq-headers) TSRMLS_CC);
-
nsapi_php_ini_entries(NSLS_C TSRMLS_CC);
+
+ if (!PG(safe_mode)) php_handle_auth_data(pblock_findval(authorization,
rq-headers) TSRMLS_CC);
file_handle.type = ZEND_HANDLE_FILENAME;
file_handle.filename = SG(request_info).path_translated;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
thetaphiWed Sep 15 17:28:30 2004 EDT
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
Fixed bug #29805 (HTTP Authentication Issues)
http://cvs.php.net/diff.php/php-src/sapi/nsapi/nsapi.c?r1=1.63r2=1.64ty=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.63 php-src/sapi/nsapi/nsapi.c:1.64
--- php-src/sapi/nsapi/nsapi.c:1.63 Sat Jun 26 06:30:07 2004
+++ php-src/sapi/nsapi/nsapi.c Wed Sep 15 17:28:30 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.63 2004/06/26 10:30:07 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.64 2004/09/15 21:28:30 thetaphi 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.63 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.64 $);
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 );
@@ -932,6 +932,8 @@
SG(request_info).content_type = nsapi_strdup(content_type);
SG(request_info).content_length = (content_length == NULL) ? 0 :
strtoul(content_length, 0, 0);
SG(sapi_headers).http_response_code = (error_directive) ? rq-status_num : 200;
+
+ if (!PG(safe_mode)) php_handle_auth_data(pblock_findval(authorization,
rq-headers) TSRMLS_CC);
nsapi_php_ini_entries(NSLS_C TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /sapi/nsapi nsapi.c
thetaphiWed Sep 15 17:51:30 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/sapi/nsapi nsapi.c
Log:
Sorry REVERT bevor 4.3.9 is out because of not critical
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.727r2=1.1247.2.728ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.727 php-src/NEWS:1.1247.2.728
--- php-src/NEWS:1.1247.2.727 Wed Sep 15 17:25:31 2004
+++ php-src/NEWSWed Sep 15 17:51:29 2004
@@ -8,7 +8,6 @@
exhaustion. (Andrei)
- Fixed bug with raw_post_data not getting set (Brian)
- Fixed a file-descriptor leak with phpinfo() and other 'special' URLs (Zeev)
-- Fixed bug #29805 (HTTP Authentication Issues). (Uwe Schindler)
- Fixed bug #29753 (mcal_fetch_event() allows 2nd argument to be optional).
(Ilia, Vrana)
- Fixed bug #29727 (Added missing CURL authentication directives). (Ilia)
http://cvs.php.net/diff.php/php-src/sapi/nsapi/nsapi.c?r1=1.28.2.30r2=1.28.2.31ty=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.28.2.30 php-src/sapi/nsapi/nsapi.c:1.28.2.31
--- php-src/sapi/nsapi/nsapi.c:1.28.2.30Wed Sep 15 17:25:31 2004
+++ php-src/sapi/nsapi/nsapi.c Wed Sep 15 17:51:29 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.28.2.30 2004/09/15 21:25:31 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.28.2.31 2004/09/15 21:51:29 thetaphi 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.28.2.30 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.28.2.31 $);
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 );
@@ -932,8 +932,6 @@
SG(request_info).content_type = nsapi_strdup(content_type);
SG(request_info).content_length = (content_length == NULL) ? 0 :
strtoul(content_length, 0, 0);
SG(sapi_headers).http_response_code = (error_directive) ? rq-status_num : 200;
-
- if (!PG(safe_mode)) php_handle_auth_data(pblock_findval(authorization,
rq-headers) TSRMLS_CC);
nsapi_php_ini_entries(NSLS_C TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
thetaphiSat Jun 26 06:30:08 2004 EDT
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
replace strncpy with strlcpy
http://cvs.php.net/diff.php/php-src/sapi/nsapi/nsapi.c?r1=1.62r2=1.63ty=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.62 php-src/sapi/nsapi/nsapi.c:1.63
--- php-src/sapi/nsapi/nsapi.c:1.62 Wed Jun 23 09:02:01 2004
+++ php-src/sapi/nsapi/nsapi.c Sat Jun 26 06:30:07 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.62 2004/06/23 13:02:01 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.63 2004/06/26 10:30:07 thetaphi 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.62 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.63 $);
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 );
@@ -604,7 +604,7 @@
while (entry) {
if (!PG(safe_mode) || strncasecmp(entry-param-name,
authorization, 13)) {
if (strcasecmp(entry-param-name,
content-length)==0 || strcasecmp(entry-param-name, content-type)==0) {
- strncpy(buf, entry-param-name, NS_BUF_SIZE);
+ strlcpy(buf, entry-param-name, NS_BUF_SIZE);
pos = 0;
} else {
snprintf(buf, NS_BUF_SIZE, HTTP_%s,
entry-param-name);
@@ -672,8 +672,7 @@
/* Create full Request-URI Script-Name */
if (SG(request_info).request_uri) {
- strncpy(buf, SG(request_info).request_uri, NS_BUF_SIZE);
- buf[NS_BUF_SIZE]='\0';
+ strlcpy(buf, SG(request_info).request_uri, NS_BUF_SIZE);
if (SG(request_info).query_string) {
p = strchr(buf, 0);
snprintf(p, NS_BUF_SIZE-(p-buf), ?%s,
SG(request_info).query_string);
@@ -681,8 +680,7 @@
}
php_register_variable(REQUEST_URI, buf, track_vars_array TSRMLS_CC);
- strncpy(buf, SG(request_info).request_uri, NS_BUF_SIZE);
- buf[NS_BUF_SIZE]='\0';
+ strlcpy(buf, SG(request_info).request_uri, NS_BUF_SIZE);
if (rc-path_info) {
pos = strlen(SG(request_info).request_uri) -
strlen(rc-path_info);
if (pos=0 pos=NS_BUF_SIZE rc-path_info) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /sapi/nsapi nsapi.c
thetaphiSat Jun 26 06:30:22 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/sapi/nsapi nsapi.c
Log:
MFH: replace strncpy with strlcpy
http://cvs.php.net/diff.php/php-src/sapi/nsapi/nsapi.c?r1=1.28.2.28r2=1.28.2.29ty=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.28.2.28 php-src/sapi/nsapi/nsapi.c:1.28.2.29
--- php-src/sapi/nsapi/nsapi.c:1.28.2.28Wed Jun 23 09:01:50 2004
+++ php-src/sapi/nsapi/nsapi.c Sat Jun 26 06:30:22 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.28.2.28 2004/06/23 13:01:50 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.28.2.29 2004/06/26 10:30:22 thetaphi 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.28.2.28 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.28.2.29 $);
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 );
@@ -604,7 +604,7 @@
while (entry) {
if (!PG(safe_mode) || strncasecmp(entry-param-name,
authorization, 13)) {
if (strcasecmp(entry-param-name,
content-length)==0 || strcasecmp(entry-param-name, content-type)==0) {
- strncpy(buf, entry-param-name, NS_BUF_SIZE);
+ strlcpy(buf, entry-param-name, NS_BUF_SIZE);
pos = 0;
} else {
snprintf(buf, NS_BUF_SIZE, HTTP_%s,
entry-param-name);
@@ -672,8 +672,7 @@
/* Create full Request-URI Script-Name */
if (SG(request_info).request_uri) {
- strncpy(buf, SG(request_info).request_uri, NS_BUF_SIZE);
- buf[NS_BUF_SIZE]='\0';
+ strlcpy(buf, SG(request_info).request_uri, NS_BUF_SIZE);
if (SG(request_info).query_string) {
p = strchr(buf, 0);
snprintf(p, NS_BUF_SIZE-(p-buf), ?%s,
SG(request_info).query_string);
@@ -681,8 +680,7 @@
}
php_register_variable(REQUEST_URI, buf, track_vars_array TSRMLS_CC);
- strncpy(buf, SG(request_info).request_uri, NS_BUF_SIZE);
- buf[NS_BUF_SIZE]='\0';
+ strlcpy(buf, SG(request_info).request_uri, NS_BUF_SIZE);
if (rc-path_info) {
pos = strlen(SG(request_info).request_uri) -
strlen(rc-path_info);
if (pos=0 pos=NS_BUF_SIZE rc-path_info) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /sapi/nsapi nsapi.c
thetaphiWed Jun 23 09:01:51 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/sapi/nsapi nsapi.c
Log:
Addendum to bug #28878: change ini keys as PHP_INI_SYSTEM
Also: Adding bucket parameter to non-ini-keys, Elemination of double
CONTENT_TYPE/_LENGTH environment variables
http://cvs.php.net/diff.php/php-src/sapi/nsapi/nsapi.c?r1=1.28.2.27r2=1.28.2.28ty=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.28.2.27 php-src/sapi/nsapi/nsapi.c:1.28.2.28
--- php-src/sapi/nsapi/nsapi.c:1.28.2.27Tue Jun 22 11:37:55 2004
+++ php-src/sapi/nsapi/nsapi.c Wed Jun 23 09:01:50 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.28.2.27 2004/06/22 15:37:55 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.28.2.28 2004/06/23 13:01:50 thetaphi Exp $ */
/*
* PHP includes
@@ -105,12 +105,6 @@
const char *nsapi_eq;
} nsapi_equiv;
-static nsapi_equiv nsapi_headers[] = {
- { CONTENT_LENGTH, content-length },
- { CONTENT_TYPE, content-type }
-};
-static size_t nsapi_headers_size = sizeof(nsapi_headers)/sizeof(nsapi_headers[0]);
-
static nsapi_equiv nsapi_reqpb[] = {
{ QUERY_STRING, query },
{ REQUEST_LINE, clf-request },
@@ -136,7 +130,7 @@
static size_t nsapi_client_size = sizeof(nsapi_client)/sizeof(nsapi_client[0]);
/* this parameters to Service/Error are NSAPI ones which should not be php.ini
keys and are excluded */
-static char *nsapi_exclude_from_ini_entries[] = { fn, type, method,
directive, code, reason, script, NULL };
+static char *nsapi_exclude_from_ini_entries[] = { fn, type, method,
directive, code, reason, script, bucket, NULL };
static char *nsapi_strdup(char *str)
{
@@ -316,7 +310,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.28.2.27 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.28.2.28 $);
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 );
@@ -605,20 +599,19 @@
}
}
- for (i = 0; i nsapi_headers_size; i++) {
- value = pblock_findval(nsapi_headers[i].nsapi_eq, rc-rq-headers);
- if (value) {
- php_register_variable((char *)nsapi_headers[i].env_var, value,
track_vars_array TSRMLS_CC);
- }
- }
-
for (i=0; i rc-rq-headers-hsize; i++) {
entry=rc-rq-headers-ht[i];
while (entry) {
if (!PG(safe_mode) || strncasecmp(entry-param-name,
authorization, 13)) {
- snprintf(buf, NS_BUF_SIZE, HTTP_%s,
entry-param-name);
+ if (strcasecmp(entry-param-name,
content-length)==0 || strcasecmp(entry-param-name, content-type)==0) {
+ strncpy(buf, entry-param-name, NS_BUF_SIZE);
+ pos = 0;
+ } else {
+ snprintf(buf, NS_BUF_SIZE, HTTP_%s,
entry-param-name);
+ pos = 5;
+ }
buf[NS_BUF_SIZE]='\0';
- for(p = buf + 5; *p; p++) {
+ for(p = buf + pos; *p; p++) {
*p = toupper(*p);
if (*p 'A' || *p 'Z') {
*p = '_';
@@ -777,7 +770,7 @@
/* change the ini entry */
if (zend_alter_ini_entry(entry-param-name,
strlen(entry-param-name)+1,
entry-param-value, strlen(entry-param-value),
-PHP_INI_USER, PHP_INI_STAGE_RUNTIME)==FAILURE) {
+PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME)==FAILURE) {
log_error(LOG_WARN, pblock_findval(fn,
NSG(pb)), NSG(sn), NSG(rq), Cannot change php.ini key \%s\ to \%s\,
entry-param-name, entry-param-value);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
thetaphiWed Jun 23 09:02:01 2004 EDT
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
Addendum to bug #28878: change ini keys as PHP_INI_SYSTEM
Also: Adding bucket parameter to non-ini-keys, Elemination of double
CONTENT_TYPE/_LENGTH environment variables
http://cvs.php.net/diff.php/php-src/sapi/nsapi/nsapi.c?r1=1.61r2=1.62ty=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.61 php-src/sapi/nsapi/nsapi.c:1.62
--- php-src/sapi/nsapi/nsapi.c:1.61 Tue Jun 22 11:37:40 2004
+++ php-src/sapi/nsapi/nsapi.c Wed Jun 23 09:02:01 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.61 2004/06/22 15:37:40 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.62 2004/06/23 13:02:01 thetaphi Exp $ */
/*
* PHP includes
@@ -105,12 +105,6 @@
const char *nsapi_eq;
} nsapi_equiv;
-static nsapi_equiv nsapi_headers[] = {
- { CONTENT_LENGTH, content-length },
- { CONTENT_TYPE, content-type }
-};
-static size_t nsapi_headers_size = sizeof(nsapi_headers)/sizeof(nsapi_headers[0]);
-
static nsapi_equiv nsapi_reqpb[] = {
{ QUERY_STRING, query },
{ REQUEST_LINE, clf-request },
@@ -136,7 +130,7 @@
static size_t nsapi_client_size = sizeof(nsapi_client)/sizeof(nsapi_client[0]);
/* this parameters to Service/Error are NSAPI ones which should not be php.ini
keys and are excluded */
-static char *nsapi_exclude_from_ini_entries[] = { fn, type, method,
directive, code, reason, script, NULL };
+static char *nsapi_exclude_from_ini_entries[] = { fn, type, method,
directive, code, reason, script, bucket, NULL };
static char *nsapi_strdup(char *str)
{
@@ -316,7 +310,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.61 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.62 $);
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 );
@@ -605,20 +599,19 @@
}
}
- for (i = 0; i nsapi_headers_size; i++) {
- value = pblock_findval(nsapi_headers[i].nsapi_eq, rc-rq-headers);
- if (value) {
- php_register_variable((char *)nsapi_headers[i].env_var, value,
track_vars_array TSRMLS_CC);
- }
- }
-
for (i=0; i rc-rq-headers-hsize; i++) {
entry=rc-rq-headers-ht[i];
while (entry) {
if (!PG(safe_mode) || strncasecmp(entry-param-name,
authorization, 13)) {
- snprintf(buf, NS_BUF_SIZE, HTTP_%s,
entry-param-name);
+ if (strcasecmp(entry-param-name,
content-length)==0 || strcasecmp(entry-param-name, content-type)==0) {
+ strncpy(buf, entry-param-name, NS_BUF_SIZE);
+ pos = 0;
+ } else {
+ snprintf(buf, NS_BUF_SIZE, HTTP_%s,
entry-param-name);
+ pos = 5;
+ }
buf[NS_BUF_SIZE]='\0';
- for(p = buf + 5; *p; p++) {
+ for(p = buf + pos; *p; p++) {
*p = toupper(*p);
if (*p 'A' || *p 'Z') {
*p = '_';
@@ -777,7 +770,7 @@
/* change the ini entry */
if (zend_alter_ini_entry(entry-param-name,
strlen(entry-param-name)+1,
entry-param-value, strlen(entry-param-value),
-PHP_INI_USER, PHP_INI_STAGE_RUNTIME)==FAILURE) {
+PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME)==FAILURE) {
log_error(LOG_WARN, pblock_findval(fn,
NSG(pb)), NSG(sn), NSG(rq), Cannot change php.ini key \%s\ to \%s\,
entry-param-name, entry-param-value);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS
thetaphiWed Jun 23 09:05:13 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: Addendum to bug #28878: change ini keys as PHP_INI_SYSTEM Also: Adding bucket parameter to non-ini-keys, Elemination of double CONTENT_TYPE/_LENGTH environment variables http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.686r2=1.1247.2.687ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.686 php-src/NEWS:1.1247.2.687 --- php-src/NEWS:1.1247.2.686 Tue Jun 22 18:20:38 2004 +++ php-src/NEWSWed Jun 23 09:05:12 2004 @@ -2,6 +2,8 @@ ||| ?? ??? 2004, Version 4.3.8 - Updated PCRE to provide better error handling in certain cases. (Andrei) +- NSAPI: added bucket parameter to list of non-php.ini-keys of php4_execute + for doing performance stats without warnings in server-log. (Uwe Schindler) - Fixed bug #28868 (Internal wrapper registry not thread safe). (Sara) - Fixed bug #28818 (Apache 2 sapis do not export st_dev). (xuefer at 21cn dot com, Ilia). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
thetaphiTue Jun 22 11:37:40 2004 EDT
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
Fix bug #28878: php.ini values in php5_execute
http://cvs.php.net/diff.php/php-src/sapi/nsapi/nsapi.c?r1=1.60r2=1.61ty=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.60 php-src/sapi/nsapi/nsapi.c:1.61
--- php-src/sapi/nsapi/nsapi.c:1.60 Mon May 3 08:23:25 2004
+++ php-src/sapi/nsapi/nsapi.c Tue Jun 22 11:37:40 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.60 2004/05/03 12:23:25 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.61 2004/06/22 15:37:40 thetaphi Exp $ */
/*
* PHP includes
@@ -316,7 +316,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.60 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.61 $);
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 );
@@ -770,7 +770,7 @@
/* exclude standard entries given to Service which should
not go into ini entries */
ok=1;
for (j=0; nsapi_exclude_from_ini_entries[j]; j++) {
- ok=(!strcasecmp(entry-param-name,
nsapi_exclude_from_ini_entries[j]));
+ ok=(strcasecmp(entry-param-name,
nsapi_exclude_from_ini_entries[j])!=0);
}
if (ok) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /sapi/nsapi nsapi.c
thetaphiTue Jun 22 11:37:55 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/sapi/nsapi nsapi.c
Log:
Fix bug #28878: php.ini values in php4_execute
http://cvs.php.net/diff.php/php-src/sapi/nsapi/nsapi.c?r1=1.28.2.26r2=1.28.2.27ty=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.28.2.26 php-src/sapi/nsapi/nsapi.c:1.28.2.27
--- php-src/sapi/nsapi/nsapi.c:1.28.2.26Mon May 3 08:22:54 2004
+++ php-src/sapi/nsapi/nsapi.c Tue Jun 22 11:37:55 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.28.2.26 2004/05/03 12:22:54 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.28.2.27 2004/06/22 15:37:55 thetaphi Exp $ */
/*
* PHP includes
@@ -316,7 +316,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.28.2.26 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.28.2.27 $);
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 );
@@ -770,7 +770,7 @@
/* exclude standard entries given to Service which should
not go into ini entries */
ok=1;
for (j=0; nsapi_exclude_from_ini_entries[j]; j++) {
- ok=(!strcasecmp(entry-param-name,
nsapi_exclude_from_ini_entries[j]));
+ ok=(strcasecmp(entry-param-name,
nsapi_exclude_from_ini_entries[j])!=0);
}
if (ok) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS
thetaphiTue Jun 22 11:55:06 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: Fix bug #28878: php.ini values in php4_execute http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.684r2=1.1247.2.685ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.684 php-src/NEWS:1.1247.2.685 --- php-src/NEWS:1.1247.2.684 Mon Jun 21 15:34:58 2004 +++ php-src/NEWSTue Jun 22 11:55:05 2004 @@ -21,6 +21,7 @@ represented as a string). (pickett at sumu dot org, Ilia) - Fixed bug #28175 (Allow bundled GD to compile against freetype 2.1.2). (Elf, Ilia) +- Fixed bug #28878 (Setting of inikey's in obj.conf fails). (Uwe Schindler) 03 Jun 2004, Version 4.3.7 - Upgraded bundled GD library to 2.0.23. (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /sapi/nsapi nsapi.c
thetaphiMon May 3 08:22:54 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/sapi/nsapi nsapi.c
Log:
Security fix: Put '\0' string termination before loop
http://cvs.php.net/diff.php/php-src/sapi/nsapi/nsapi.c?r1=1.28.2.25r2=1.28.2.26ty=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.28.2.25 php-src/sapi/nsapi/nsapi.c:1.28.2.26
--- php-src/sapi/nsapi/nsapi.c:1.28.2.25Fri Dec 12 11:21:44 2003
+++ php-src/sapi/nsapi/nsapi.c Mon May 3 08:22:54 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.28.2.25 2003/12/12 16:21:44 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.28.2.26 2004/05/03 12:22:54 thetaphi Exp $ */
/*
* PHP includes
@@ -316,7 +316,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.28.2.25 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.28.2.26 $);
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 );
@@ -617,13 +617,13 @@
while (entry) {
if (!PG(safe_mode) || strncasecmp(entry-param-name,
authorization, 13)) {
snprintf(buf, NS_BUF_SIZE, HTTP_%s,
entry-param-name);
+ buf[NS_BUF_SIZE]='\0';
for(p = buf + 5; *p; p++) {
*p = toupper(*p);
if (*p 'A' || *p 'Z') {
*p = '_';
}
}
- buf[NS_BUF_SIZE]='\0';
php_register_variable(buf, entry-param-value,
track_vars_array TSRMLS_CC);
}
entry=entry-next;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
thetaphiMon May 3 08:23:25 2004 EDT
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
Security fix: Put '\0' string termination before loop
http://cvs.php.net/diff.php/php-src/sapi/nsapi/nsapi.c?r1=1.59r2=1.60ty=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.59 php-src/sapi/nsapi/nsapi.c:1.60
--- php-src/sapi/nsapi/nsapi.c:1.59 Thu Jan 8 03:18:14 2004
+++ php-src/sapi/nsapi/nsapi.c Mon May 3 08:23:25 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.59 2004/01/08 08:18:14 andi Exp $ */
+/* $Id: nsapi.c,v 1.60 2004/05/03 12:23:25 thetaphi Exp $ */
/*
* PHP includes
@@ -316,7 +316,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.59 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.60 $);
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 );
@@ -617,13 +617,13 @@
while (entry) {
if (!PG(safe_mode) || strncasecmp(entry-param-name,
authorization, 13)) {
snprintf(buf, NS_BUF_SIZE, HTTP_%s,
entry-param-name);
+ buf[NS_BUF_SIZE]='\0';
for(p = buf + 5; *p; p++) {
*p = toupper(*p);
if (*p 'A' || *p 'Z') {
*p = '_';
}
}
- buf[NS_BUF_SIZE]='\0';
php_register_variable(buf, entry-param-value,
track_vars_array TSRMLS_CC);
}
entry=entry-next;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sybase php_sybase_db.c /ext/sybase_ct php_sybase_ct.c
thetaphiFri Apr 16 12:27:13 2004 EDT
Modified files:
/php-src/ext/sybase php_sybase_db.c
/php-src/ext/sybase_ct php_sybase_ct.c
Log:
set Sybase default APPNAME to (PHP PHP_VERSION)
http://cvs.php.net/diff.php/php-src/ext/sybase/php_sybase_db.c?r1=1.60r2=1.61ty=u
Index: php-src/ext/sybase/php_sybase_db.c
diff -u php-src/ext/sybase/php_sybase_db.c:1.60 php-src/ext/sybase/php_sybase_db.c:1.61
--- php-src/ext/sybase/php_sybase_db.c:1.60 Tue Jan 27 20:43:39 2004
+++ php-src/ext/sybase/php_sybase_db.c Fri Apr 16 12:27:13 2004
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_sybase_db.c,v 1.60 2004/01/28 01:43:39 iliaa Exp $ */
+/* $Id: php_sybase_db.c,v 1.61 2004/04/16 16:27:13 thetaphi Exp $ */
#ifdef HAVE_CONFIG_H
@@ -281,7 +281,7 @@
{
php_sybase_module.default_link=-1;
php_sybase_module.num_links = php_sybase_module.num_persistent;
- php_sybase_module.appname = estrndup(PHP 5, 5);
+ php_sybase_module.appname = estrndup(PHP PHP_VERSION, sizeof(PHP
PHP_VERSION));
php_sybase_module.server_message = empty_string;
php_sybase_module.min_error_severity =
php_sybase_module.cfg_min_error_severity;
php_sybase_module.min_message_severity =
php_sybase_module.cfg_min_message_severity;
http://cvs.php.net/diff.php/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.92r2=1.93ty=u
Index: php-src/ext/sybase_ct/php_sybase_ct.c
diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.92
php-src/ext/sybase_ct/php_sybase_ct.c:1.93
--- php-src/ext/sybase_ct/php_sybase_ct.c:1.92 Sun Feb 15 05:53:45 2004
+++ php-src/ext/sybase_ct/php_sybase_ct.c Fri Apr 16 12:27:13 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_sybase_ct.c,v 1.92 2004/02/15 10:53:45 thekid Exp $ */
+/* $Id: php_sybase_ct.c,v 1.93 2004/04/16 16:27:13 thetaphi Exp $ */
#ifdef HAVE_CONFIG_H
@@ -427,7 +427,7 @@
{
SybCtG(default_link)=-1;
SybCtG(num_links) = SybCtG(num_persistent);
- SybCtG(appname) = estrndup(PHP 5, 5);
+ SybCtG(appname) = estrndup(PHP PHP_VERSION, sizeof(PHP PHP_VERSION));
SybCtG(server_message) = empty_string;
return SUCCESS;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/sybase php_sybase_db.c /ext/sybase_ct php_sybase_ct.c
thetaphiFri Apr 16 12:27:57 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/sybase php_sybase_db.c
/php-src/ext/sybase_ct php_sybase_ct.c
Log:
MFH: set Sybase default APPNAME to (PHP PHP_VERSION)
http://cvs.php.net/diff.php/php-src/ext/sybase/php_sybase_db.c?r1=1.38.2.15r2=1.38.2.16ty=u
Index: php-src/ext/sybase/php_sybase_db.c
diff -u php-src/ext/sybase/php_sybase_db.c:1.38.2.15
php-src/ext/sybase/php_sybase_db.c:1.38.2.16
--- php-src/ext/sybase/php_sybase_db.c:1.38.2.15Tue Jan 27 20:43:44 2004
+++ php-src/ext/sybase/php_sybase_db.c Fri Apr 16 12:27:57 2004
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_sybase_db.c,v 1.38.2.15 2004/01/28 01:43:44 iliaa Exp $ */
+/* $Id: php_sybase_db.c,v 1.38.2.16 2004/04/16 16:27:57 thetaphi Exp $ */
#ifdef HAVE_CONFIG_H
@@ -281,7 +281,7 @@
{
php_sybase_module.default_link=-1;
php_sybase_module.num_links = php_sybase_module.num_persistent;
- php_sybase_module.appname = estrndup(PHP 4.0,7);
+ php_sybase_module.appname = estrndup(PHP PHP_VERSION, sizeof(PHP
PHP_VERSION));
php_sybase_module.server_message = empty_string;
php_sybase_module.min_error_severity =
php_sybase_module.cfg_min_error_severity;
php_sybase_module.min_message_severity =
php_sybase_module.cfg_min_message_severity;
http://cvs.php.net/diff.php/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.73.2.11r2=1.73.2.12ty=u
Index: php-src/ext/sybase_ct/php_sybase_ct.c
diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.73.2.11
php-src/ext/sybase_ct/php_sybase_ct.c:1.73.2.12
--- php-src/ext/sybase_ct/php_sybase_ct.c:1.73.2.11 Sun Feb 15 05:55:55 2004
+++ php-src/ext/sybase_ct/php_sybase_ct.c Fri Apr 16 12:27:57 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_sybase_ct.c,v 1.73.2.11 2004/02/15 10:55:55 thekid Exp $ */
+/* $Id: php_sybase_ct.c,v 1.73.2.12 2004/04/16 16:27:57 thetaphi Exp $ */
#ifdef HAVE_CONFIG_H
@@ -427,7 +427,7 @@
{
SybCtG(default_link)=-1;
SybCtG(num_links) = SybCtG(num_persistent);
- SybCtG(appname) = estrndup(PHP 4.0, 7);
+ SybCtG(appname) = estrndup(PHP PHP_VERSION, sizeof(PHP PHP_VERSION));
SybCtG(server_message) = empty_string;
return SUCCESS;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi-readme.txt
thetaphiThu Mar 18 08:37:18 2004 EDT Modified files: /php-src/sapi/nsapi nsapi-readme.txt Log: hint to raise stacksize (bug #27231) http://cvs.php.net/diff.php/php-src/sapi/nsapi/nsapi-readme.txt?r1=1.11r2=1.12ty=u Index: php-src/sapi/nsapi/nsapi-readme.txt diff -u php-src/sapi/nsapi/nsapi-readme.txt:1.11 php-src/sapi/nsapi/nsapi-readme.txt:1.12 --- php-src/sapi/nsapi/nsapi-readme.txt:1.11Fri Oct 17 17:58:26 2003 +++ php-src/sapi/nsapi/nsapi-readme.txt Thu Mar 18 08:37:16 2004 @@ -68,6 +68,10 @@ the style x-httpd-php. All files in it will get executed as PHP. This is nice to hide PHP usage by renaming files to .html +Note: The stacksize that PHP uses depends on the configuration of the webserver. If you get +crashes with very large PHP scripts, it is recommended to raise it with the Admin Server +(in the section MAGNUS EDITOR). + Authentication configuration @@ -147,4 +151,4 @@ But be warned: SUPPORT FOR nsapi_virtual() IS EXPERIMENTAL !!! -$Id: nsapi-readme.txt,v 1.11 2003/10/17 21:58:26 thetaphi Exp $ +$Id: nsapi-readme.txt,v 1.12 2004/03/18 13:37:16 thetaphi Exp $ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /sapi/nsapi nsapi-readme.txt
thetaphiThu Mar 18 08:37:42 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/sapi/nsapi nsapi-readme.txt Log: hint to raise stacksize (bug #27231) http://cvs.php.net/diff.php/php-src/sapi/nsapi/nsapi-readme.txt?r1=1.3.8.8r2=1.3.8.9ty=u Index: php-src/sapi/nsapi/nsapi-readme.txt diff -u php-src/sapi/nsapi/nsapi-readme.txt:1.3.8.8 php-src/sapi/nsapi/nsapi-readme.txt:1.3.8.9 --- php-src/sapi/nsapi/nsapi-readme.txt:1.3.8.8 Fri Oct 17 17:57:45 2003 +++ php-src/sapi/nsapi/nsapi-readme.txt Thu Mar 18 08:37:41 2004 @@ -68,6 +68,10 @@ the style x-httpd-php. All files in it will get executed as PHP. This is nice to hide PHP usage by renaming files to .html +Note: The stacksize that PHP uses depends on the configuration of the webserver. If you get +crashes with very large PHP scripts, it is recommended to raise it with the Admin Server +(in the section MAGNUS EDITOR). + Authentication configuration @@ -147,4 +151,4 @@ But be warned: SUPPORT FOR nsapi_virtual() IS EXPERIMENTAL !!! -$Id: nsapi-readme.txt,v 1.3.8.8 2003/10/17 21:57:45 thetaphi Exp $ +$Id: nsapi-readme.txt,v 1.3.8.9 2004/03/18 13:37:41 thetaphi Exp $ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/continuity capi.c /sapi/nsapi nsapi.c
thetaphiFri Dec 12 11:21:29 2003 EDT
Modified files:
/php-src/sapi/continuitycapi.c
/php-src/sapi/nsapi nsapi.c
Log:
remove revision tag from module version entry
Index: php-src/sapi/continuity/capi.c
diff -u php-src/sapi/continuity/capi.c:1.4 php-src/sapi/continuity/capi.c:1.5
--- php-src/sapi/continuity/capi.c:1.4 Tue Dec 9 11:24:03 2003
+++ php-src/sapi/continuity/capi.c Fri Dec 12 11:21:27 2003
@@ -93,7 +93,7 @@
NULL,
NULL,
PHP_MINFO(continuity),
-$Revision: 1.4 $,
+NO_VERSION_YET,
STANDARD_MODULE_PROPERTIES
};
@@ -110,7 +110,7 @@
PHP_MINFO_FUNCTION(continuity)
{
php_info_print_table_start();
-php_info_print_table_row(2, Continuity Module Version,
continuity_module_entry.version);
+php_info_print_table_row(2, Continuity Module Revision, $Revision: 1.5 $);
php_info_print_table_row(2, Server Version, conFget_build());
#ifdef CONTINUITY_CDPEXT
php_info_print_table_row(2,CDP Extensions, enabled);
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.57 php-src/sapi/nsapi/nsapi.c:1.58
--- php-src/sapi/nsapi/nsapi.c:1.57 Fri Oct 31 12:31:46 2003
+++ php-src/sapi/nsapi/nsapi.c Fri Dec 12 11:21:28 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.57 2003/10/31 17:31:46 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.58 2003/12/12 16:21:28 thetaphi Exp $ */
/*
* PHP includes
@@ -203,7 +203,7 @@
NULL,
NULL,
PHP_MINFO(nsapi),
- $Revision: 1.57 $,
+ NO_VERSION_YET,
STANDARD_MODULE_PROPERTIES
};
/* }}} */
@@ -316,7 +316,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Version,
nsapi_module_entry.version);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.58 $);
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 );
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /sapi/nsapi nsapi.c
thetaphiFri Dec 12 11:21:45 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/sapi/nsapi nsapi.c
Log:
remove revision tag from module version entry
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.28.2.24 php-src/sapi/nsapi/nsapi.c:1.28.2.25
--- php-src/sapi/nsapi/nsapi.c:1.28.2.24Sat Nov 1 18:56:58 2003
+++ php-src/sapi/nsapi/nsapi.c Fri Dec 12 11:21:44 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.28.2.24 2003/11/01 23:56:58 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.28.2.25 2003/12/12 16:21:44 thetaphi Exp $ */
/*
* PHP includes
@@ -203,7 +203,7 @@
NULL,
NULL,
PHP_MINFO(nsapi),
- $Revision: 1.28.2.24 $,
+ NO_VERSION_YET,
STANDARD_MODULE_PROPERTIES
};
/* }}} */
@@ -316,7 +316,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Version,
nsapi_module_entry.version);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.28.2.25 $);
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 );
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/standard browscap.c
thetaphiThu Dec 4 03:56:08 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/standard browscap.c
Log:
Fix bug #25916: get_browser() - PHP Fatal error: Nesting level too deep - recursive
dependency?
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.491 php-src/NEWS:1.1247.2.492
--- php-src/NEWS:1.1247.2.491 Thu Dec 4 01:37:14 2003
+++ php-src/NEWSThu Dec 4 03:56:06 2003
@@ -5,6 +5,8 @@
(Jani)
- Fixed header handler in NSAPI SAPI module (header-replace was ignored,
send_default_content_type now sends value from php.ini). (Uwe Schindler)
+- Fixed bug #25916 (get_browser() - PHP Fatal error: Nesting level
+ too deep - recursive dependency?). (Uwe Schindler)
- Fixed bug #26488 (Missing declaration of CRTSCTS in ext/dio/dio.c). (Jani)
- Fixed bug #26467 (flock() does not force the wouldblock parameter to be
passed by reference). (Wez)
Index: php-src/ext/standard/browscap.c
diff -u php-src/ext/standard/browscap.c:1.60.2.15
php-src/ext/standard/browscap.c:1.60.2.16
--- php-src/ext/standard/browscap.c:1.60.2.15 Wed Aug 13 19:39:03 2003
+++ php-src/ext/standard/browscap.c Thu Dec 4 03:56:07 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: browscap.c,v 1.60.2.15 2003/08/13 23:39:03 sniper Exp $ */
+/* $Id: browscap.c,v 1.60.2.16 2003/12/04 08:56:07 thetaphi Exp $ */
#include php.h
#include php_regex.h
@@ -149,7 +149,7 @@
zend_file_handle fh;
memset(fh, 0, sizeof(fh));
- if (zend_hash_init(browser_hash, 0, NULL, (dtor_func_t)
browscap_entry_dtor, 1)==FAILURE) {
+ if (zend_hash_init_ex(browser_hash, 0, NULL, (dtor_func_t)
browscap_entry_dtor, 1, 0)==FAILURE) {
return FAILURE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
