[PHP-CVS] cvs: php-src /main php.h
helly Thu Sep 30 04:03:41 2004 EDT Modified files: /php-src/main php.h Log: - Add missing macro http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.204r2=1.205ty=u Index: php-src/main/php.h diff -u php-src/main/php.h:1.204 php-src/main/php.h:1.205 --- php-src/main/php.h:1.204Wed Sep 29 10:42:16 2004 +++ php-src/main/php.h Thu Sep 30 04:03:38 2004 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php.h,v 1.204 2004/09/29 14:42:16 hyanantha Exp $ */ +/* $Id: php.h,v 1.205 2004/09/30 08:03:38 helly Exp $ */ #ifndef PHP_H #define PHP_H @@ -337,6 +337,7 @@ #define PHP_FE ZEND_FE #define PHP_FALIAS ZEND_FALIAS #define PHP_ME ZEND_ME +#define PHP_MALIAS ZEND_MALIAS #define PHP_ME_MAPPING ZEND_ME_MAPPING #define PHP_MODULE_STARTUP_N ZEND_MODULE_STARTUP_N -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl_functions.h
helly Thu Sep 30 04:04:29 2004 EDT Modified files: /php-src/ext/splspl_functions.h Log: - CS: Use PHP_* instead of ZEND_* macros http://cvs.php.net/diff.php/php-src/ext/spl/spl_functions.h?r1=1.17r2=1.18ty=u Index: php-src/ext/spl/spl_functions.h diff -u php-src/ext/spl/spl_functions.h:1.17 php-src/ext/spl/spl_functions.h:1.18 --- php-src/ext/spl/spl_functions.h:1.17Mon Apr 12 09:02:54 2004 +++ php-src/ext/spl/spl_functions.h Thu Sep 30 04:04:29 2004 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: spl_functions.h,v 1.17 2004/04/12 13:02:54 helly Exp $ */ +/* $Id: spl_functions.h,v 1.18 2004/09/30 08:04:29 helly Exp $ */ #ifndef PHP_FUNCTIONS_H #define PHP_FUNCTIONS_H @@ -82,7 +82,7 @@ PHP_METHOD(spl_ ## class_name, function_name) #define SPL_MA(class_name, function_name, alias_class, alias_function, arg_info, flags) \ - ZEND_MALIAS(spl_ ## alias_class, function_name, alias_function, arg_info, flags) + PHP_MALIAS(spl_ ## alias_class, function_name, alias_function, arg_info, flags) #endif /* PHP_FUNCTIONS_H */ /* -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
wez Thu Sep 30 06:46:55 2004 EDT Modified files: /CVSROOTavail Log: bcompiler karma for val http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.910r2=1.911ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.910 CVSROOT/avail:1.911 --- CVSROOT/avail:1.910 Sat Sep 25 10:23:17 2004 +++ CVSROOT/avail Thu Sep 30 06:46:54 2004 @@ -229,6 +229,7 @@ avail|michael|pecl/newt avail|ccollie|pecl/i18n avail|mksheoran|pecl/daffodildb +avail|val|pecl/bcompiler # Curl modules avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/session session.c
tony2001Thu Sep 30 08:19:59 2004 EDT
Modified files:
/php-src/ext/sessionsession.c
Log:
fix segfault when using unknown/unsupported save_handler and/or serialize_handler
(bug #30282)
http://cvs.php.net/diff.php/php-src/ext/session/session.c?r1=1.395r2=1.396ty=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.395 php-src/ext/session/session.c:1.396
--- php-src/ext/session/session.c:1.395 Tue Sep 14 19:57:53 2004
+++ php-src/ext/session/session.c Thu Sep 30 08:19:59 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.395 2004/09/14 23:57:53 iliaa Exp $ */
+/* $Id: session.c,v 1.396 2004/09/30 12:19:59 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -543,7 +543,11 @@
char *ret = NULL;
IF_SESSION_VARS() {
- if (PS(serializer)-encode(ret, newlen TSRMLS_CC) == FAILURE)
+ if (!PS(serializer)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown
session.save_handler. Failed to encode session object.);
+ ret = NULL;
+ }
+ else if (PS(serializer)-encode(ret, newlen TSRMLS_CC) == FAILURE)
ret = NULL;
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot encode
non-existent session.);
@@ -554,6 +558,10 @@
static void php_session_decode(const char *val, int vallen TSRMLS_DC)
{
+ if (!PS(serializer)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown
session.save_handler. Failed to decode session object.);
+ return;
+ }
if (PS(serializer)-decode(val, vallen TSRMLS_CC) == FAILURE) {
php_session_destroy(TSRMLS_C);
php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed to decode session
object. Session has been destroyed.);
@@ -1087,6 +1095,21 @@
PS(define_sid) = 1;
PS(send_cookie) = 1;
if (PS(session_status) != php_session_none) {
+
+ if (PS(session_status) == php_session_disabled) {
+ char *value;
+
+ value = zend_ini_string(session.save_handler,
sizeof(session.save_handler), 0);
+
+ if (value) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot
find save handler %s, value);
+ }
+ else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot
find unknown save handler);
+ }
+ return;
+ }
+
php_error(E_NOTICE, A session had already been started - ignoring
session_start());
return;
}
@@ -1498,9 +1521,15 @@
WRONG_PARAM_COUNT;
}
- if (PS(session_status) == php_session_none)
+ if (PS(session_status) == php_session_none || PS(session_status) ==
php_session_disabled) {
php_session_start(TSRMLS_C);
-
+ }
+
+ if (PS(session_status) == php_session_disabled) {
+ efree(args);
+ RETURN_FALSE;
+ }
+
for (i = 0; i argc; i++) {
if (Z_TYPE_PP(args[i]) == IS_ARRAY)
SEPARATE_ZVAL(args[i]);
--
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/session session.c
tony2001Thu Sep 30 08:37:36 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/sessionsession.c
Log:
MFH: fix segfaults and bug #30282 and suppress compile warnings
http://cvs.php.net/diff.php/php-src/ext/session/session.c?r1=1.391.2.1r2=1.391.2.2ty=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.391.2.1 php-src/ext/session/session.c:1.391.2.2
--- php-src/ext/session/session.c:1.391.2.1 Wed Sep 1 22:44:12 2004
+++ php-src/ext/session/session.c Thu Sep 30 08:37:35 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.391.2.1 2004/09/02 02:44:12 iliaa Exp $ */
+/* $Id: session.c,v 1.391.2.2 2004/09/30 12:37:35 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -424,7 +424,7 @@
if (has_value) {
MAKE_STD_ZVAL(current);
- if (php_var_unserialize(current, p, endptr, var_hash
TSRMLS_CC)) {
+ if (php_var_unserialize(current, (const unsigned char**)p,
endptr, var_hash TSRMLS_CC)) {
php_set_session_var(name, namelen, current, var_hash
TSRMLS_CC);
}
zval_ptr_dtor(current);
@@ -504,7 +504,7 @@
if (has_value) {
ALLOC_INIT_ZVAL(current);
- if (php_var_unserialize(current, q, endptr, var_hash
TSRMLS_CC)) {
+ if (php_var_unserialize(current, (const unsigned char**)q,
endptr, var_hash TSRMLS_CC)) {
php_set_session_var(name, namelen, current, var_hash
TSRMLS_CC);
}
zval_ptr_dtor(current);
@@ -543,7 +543,11 @@
char *ret = NULL;
IF_SESSION_VARS() {
- if (PS(serializer)-encode(ret, newlen TSRMLS_CC) == FAILURE)
+ if (!PS(serializer)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown
session.save_handler. Failed to encode session object.);
+ ret = NULL;
+ }
+ else if (PS(serializer)-encode(ret, newlen TSRMLS_CC) == FAILURE)
ret = NULL;
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot encode
non-existent session.);
@@ -554,6 +558,10 @@
static void php_session_decode(const char *val, int vallen TSRMLS_DC)
{
+ if (!PS(serializer)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown
session.save_handler. Failed to decode session object.);
+ return;
+ }
if (PS(serializer)-decode(val, vallen TSRMLS_CC) == FAILURE) {
php_session_destroy(TSRMLS_C);
php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed to decode session
object. Session has been destroyed.);
@@ -1087,6 +1095,21 @@
PS(define_sid) = 1;
PS(send_cookie) = 1;
if (PS(session_status) != php_session_none) {
+
+ if (PS(session_status) == php_session_disabled) {
+ char *value;
+
+ value = zend_ini_string(session.save_handler,
sizeof(session.save_handler), 0);
+
+ if (value) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot
find save handler %s, value);
+ }
+ else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot
find unknown save handler);
+ }
+ return;
+ }
+
php_error(E_NOTICE, A session had already been started - ignoring
session_start());
return;
}
@@ -1495,8 +1518,14 @@
WRONG_PARAM_COUNT;
}
- if (PS(session_status) == php_session_none)
+ if (PS(session_status) == php_session_none || PS(session_status) ==
php_session_disabled) {
php_session_start(TSRMLS_C);
+ }
+
+ if (PS(session_status) == php_session_disabled) {
+ efree(args);
+ RETURN_FALSE;
+ }
for (i = 0; i argc; i++) {
if (Z_TYPE_PP(args[i]) == IS_ARRAY)
--
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/session session.c
tony2001Thu Sep 30 10:18:25 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/sessionsession.c
Log:
MFH: fix segfaults and bug #30282 and suppress compile warnings
http://cvs.php.net/diff.php/php-src/ext/session/session.c?r1=1.336.2.42r2=1.336.2.43ty=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.336.2.42
php-src/ext/session/session.c:1.336.2.43
--- php-src/ext/session/session.c:1.336.2.42Thu Sep 2 20:53:46 2004
+++ php-src/ext/session/session.c Thu Sep 30 10:18:25 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.336.2.42 2004/09/03 00:53:46 iliaa Exp $ */
+/* $Id: session.c,v 1.336.2.43 2004/09/30 14:18:25 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -409,7 +409,7 @@
if (has_value) {
MAKE_STD_ZVAL(current);
- if (php_var_unserialize(current, p, endptr, var_hash
TSRMLS_CC)) {
+ if (php_var_unserialize(current, (const unsigned char **)p,
endptr, var_hash TSRMLS_CC)) {
php_set_session_var(name, namelen, current, var_hash
TSRMLS_CC);
}
zval_ptr_dtor(current);
@@ -489,7 +489,7 @@
if (has_value) {
MAKE_STD_ZVAL(current);
- if (php_var_unserialize(current, q, endptr, var_hash
TSRMLS_CC)) {
+ if (php_var_unserialize(current, (const unsigned char **)q,
endptr, var_hash TSRMLS_CC)) {
php_set_session_var(name, namelen, current, var_hash
TSRMLS_CC);
}
zval_ptr_dtor(current);
@@ -528,7 +528,11 @@
char *ret = NULL;
IF_SESSION_VARS() {
- if (PS(serializer)-encode(ret, newlen TSRMLS_CC) == FAILURE)
+ if (!PS(serializer)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown
session.serialize_handler. Failed to encode session object.);
+ ret = NULL;
+ }
+ else if (PS(serializer)-encode(ret, newlen TSRMLS_CC) == FAILURE)
ret = NULL;
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot encode
non-existent session.);
@@ -539,6 +543,10 @@
static void php_session_decode(const char *val, int vallen TSRMLS_DC)
{
+ if (!PS(serializer)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown
session.serialize_handler. Failed to decode session object.);
+ return;
+ }
if (PS(serializer)-decode(val, vallen TSRMLS_CC) == FAILURE) {
php_session_destroy(TSRMLS_C);
php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed to decode session
object. Session has been destroyed.);
@@ -977,6 +985,21 @@
PS(define_sid) = 1;
PS(send_cookie) = 1;
if (PS(session_status) != php_session_none) {
+
+ if (PS(session_status) == php_session_disabled) {
+ char *value;
+
+ value = zend_ini_string(session.save_handler,
sizeof(session.save_handler), 0);
+
+ if (value) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot
find save handler %s, value);
+ }
+ else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot
find unknown save handler);
+ }
+ return;
+ }
+
php_error(E_NOTICE, A session had already been started - ignoring
session_start());
return;
}
@@ -1386,9 +1409,15 @@
WRONG_PARAM_COUNT;
}
- if (PS(session_status) == php_session_none)
+ if (PS(session_status) == php_session_none || PS(session_status) ==
php_session_disabled) {
php_session_start(TSRMLS_C);
+ }
+ if (PS(session_status) == php_session_disabled) {
+ efree(args);
+ RETURN_FALSE;
+ }
+
for (i = 0; i argc; i++) {
if (Z_TYPE_PP(args[i]) == IS_ARRAY)
SEPARATE_ZVAL(args[i]);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/session session.c
tony2001Thu Sep 30 10:20:03 2004 EDT
Modified files:
/php-src/ext/sessionsession.c
Log:
fix error message
http://cvs.php.net/diff.php/php-src/ext/session/session.c?r1=1.396r2=1.397ty=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.396 php-src/ext/session/session.c:1.397
--- php-src/ext/session/session.c:1.396 Thu Sep 30 08:19:59 2004
+++ php-src/ext/session/session.c Thu Sep 30 10:20:02 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.396 2004/09/30 12:19:59 tony2001 Exp $ */
+/* $Id: session.c,v 1.397 2004/09/30 14:20:02 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -544,7 +544,7 @@
IF_SESSION_VARS() {
if (!PS(serializer)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown
session.save_handler. Failed to encode session object.);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown
session.serialize_handler. Failed to encode session object.);
ret = NULL;
}
else if (PS(serializer)-encode(ret, newlen TSRMLS_CC) == FAILURE)
@@ -559,7 +559,7 @@
static void php_session_decode(const char *val, int vallen TSRMLS_DC)
{
if (!PS(serializer)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown
session.save_handler. Failed to decode session object.);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown
session.serialize_handler. Failed to decode session object.);
return;
}
if (PS(serializer)-decode(val, vallen TSRMLS_CC) == FAILURE) {
--
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/session session.c
tony2001Thu Sep 30 10:20:23 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/sessionsession.c
Log:
fix error message
http://cvs.php.net/diff.php/php-src/ext/session/session.c?r1=1.391.2.2r2=1.391.2.3ty=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.391.2.2 php-src/ext/session/session.c:1.391.2.3
--- php-src/ext/session/session.c:1.391.2.2 Thu Sep 30 08:37:35 2004
+++ php-src/ext/session/session.c Thu Sep 30 10:20:22 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.391.2.2 2004/09/30 12:37:35 tony2001 Exp $ */
+/* $Id: session.c,v 1.391.2.3 2004/09/30 14:20:22 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -544,7 +544,7 @@
IF_SESSION_VARS() {
if (!PS(serializer)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown
session.save_handler. Failed to encode session object.);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown
session.serialize_handler. Failed to encode session object.);
ret = NULL;
}
else if (PS(serializer)-encode(ret, newlen TSRMLS_CC) == FAILURE)
@@ -559,7 +559,7 @@
static void php_session_decode(const char *val, int vallen TSRMLS_DC)
{
if (!PS(serializer)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown
session.save_handler. Failed to decode session object.);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown
session.serialize_handler. Failed to decode session object.);
return;
}
if (PS(serializer)-decode(val, vallen TSRMLS_CC) == FAILURE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/session mod_files.c
hyanantha Thu Sep 30 10:23:51 2004 EDT
Modified files:
/php-src/ext/sessionmod_files.c
Log:
handled NetWare F_SETFD and stat differences
http://cvs.php.net/diff.php/php-src/ext/session/mod_files.c?r1=1.96r2=1.97ty=u
Index: php-src/ext/session/mod_files.c
diff -u php-src/ext/session/mod_files.c:1.96 php-src/ext/session/mod_files.c:1.97
--- php-src/ext/session/mod_files.c:1.96Mon Aug 2 04:27:24 2004
+++ php-src/ext/session/mod_files.c Thu Sep 30 10:23:51 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: mod_files.c,v 1.96 2004/08/02 08:27:24 sas Exp $ */
+/* $Id: mod_files.c,v 1.97 2004/09/30 14:23:51 hyanantha Exp $ */
#include php.h
@@ -166,7 +166,12 @@
flock(data-fd, LOCK_EX);
#ifdef F_SETFD
+#ifdef NETWARE
+ /* NetWare LibC returns -1 upon error and upon success it returns non-zero
unlike zero in other OSes*/
+ if (fcntl(data-fd, F_SETFD, 1) == -1) {
+#else
if (fcntl(data-fd, F_SETFD, 1)) {
+#endif
php_error_docref(NULL TSRMLS_CC, E_WARNING, fcntl(%d,
F_SETFD, 1) failed: %s (%d), data-fd, strerror(errno), errno);
}
#endif
@@ -216,7 +221,11 @@
buf[dirname_len + entry_len + 1] = '\0';
/* check whether its last access was more than
maxlifet ago */
if (VCWD_STAT(buf, sbuf) == 0
+#ifdef NETWARE
+ (now - sbuf.st_mtime.tv_sec)
maxlifetime) {
+#else
(now - sbuf.st_mtime) maxlifetime) {
+#endif
VCWD_UNLINK(buf);
nrdels++;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/session session.c
hyanantha Thu Sep 30 10:31:31 2004 EDT Modified files: /php-src/ext/sessionsession.c Log: NetWare specific stat structure access incorporated http://cvs.php.net/diff.php/php-src/ext/session/session.c?r1=1.397r2=1.398ty=u Index: php-src/ext/session/session.c diff -u php-src/ext/session/session.c:1.397 php-src/ext/session/session.c:1.398 --- php-src/ext/session/session.c:1.397 Thu Sep 30 10:20:02 2004 +++ php-src/ext/session/session.c Thu Sep 30 10:31:30 2004 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: session.c,v 1.397 2004/09/30 14:20:02 tony2001 Exp $ */ +/* $Id: session.c,v 1.398 2004/09/30 14:31:30 hyanantha Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -871,7 +871,11 @@ #define LAST_MODIFIED Last-Modified: memcpy(buf, LAST_MODIFIED, sizeof(LAST_MODIFIED) - 1); +#ifdef NETWARE + strcpy_gmt(buf + sizeof(LAST_MODIFIED) - 1, (sb.st_mtime.tv_sec)); +#else strcpy_gmt(buf + sizeof(LAST_MODIFIED) - 1, sb.st_mtime); +#endif ADD_HEADER(buf); } } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php_scandir.h
hyanantha Thu Sep 30 10:46:03 2004 EDT Modified files: /php-src/main php_scandir.h Log: Including config.nw.h file for NetWare http://cvs.php.net/diff.php/php-src/main/php_scandir.h?r1=1.8r2=1.9ty=u Index: php-src/main/php_scandir.h diff -u php-src/main/php_scandir.h:1.8 php-src/main/php_scandir.h:1.9 --- php-src/main/php_scandir.h:1.8 Thu Jan 8 12:33:04 2004 +++ php-src/main/php_scandir.h Thu Sep 30 10:46:03 2004 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_scandir.h,v 1.8 2004/01/08 17:33:04 sniper Exp $ */ +/* $Id: php_scandir.h,v 1.9 2004/09/30 14:46:03 hyanantha Exp $ */ #ifndef PHP_SCANDIR_H #define PHP_SCANDIR_H @@ -31,6 +31,8 @@ #ifdef PHP_WIN32 #include config.w32.h #include win32/readdir.h +#elif NETWARE +#include config.nw.h #else #include php_config.h #endif -- 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) / NEWS
tony2001Thu Sep 30 11:00:57 2004 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.87r2=1.1760.2.88ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.87 php-src/NEWS:1.1760.2.88 --- php-src/NEWS:1.1760.2.87Wed Sep 29 21:23:33 2004 +++ php-src/NEWSThu Sep 30 11:00:57 2004 @@ -1,6 +1,8 @@ PHPNEWS ||| ?? ??? 2004, PHP 5.0.3 +- Fixed bug #30282 (segfault when using unknown/unsupported session.save_handler + and/or session.serialize_handler). (Tony) - Fixed bug #30276 (Possible crash in ctype_digit on large numbers). (Ilia) - Fixed bug #30224 (Sybase date strings are sometimes not null terminated). (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) / NEWS
tony2001Thu Sep 30 11:02:07 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.736r2=1.1247.2.737ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.736 php-src/NEWS:1.1247.2.737 --- php-src/NEWS:1.1247.2.736 Wed Sep 29 21:24:03 2004 +++ php-src/NEWSThu Sep 30 11:02:06 2004 @@ -3,6 +3,8 @@ ?? ??? 2004, Version 4.3.10 - Backported Marcus' foreach() speedup patch from PHP 5.x. (Derick) - Fixed potential problems with unserializing invalid serialize data. (Marcus) +- Fixed bug #30282 (segfault when using unknown/unsupported session.save_handler + and/or session.serialize_handler). (Tony) - Fixed bug #30276 (Possible crash in ctype_digit on large numbers). (Ilia) - Fixed bug #30224 (Sybase date strings are sometimes not null terminated). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main config.nw.h
hyanantha Thu Sep 30 11:55:19 2004 EDT Modified files: /php-src/main config.nw.h Log: enabling few functionalities as the LibC starts supporting them http://cvs.php.net/diff.php/php-src/main/config.nw.h?r1=1.6r2=1.7ty=u Index: php-src/main/config.nw.h diff -u php-src/main/config.nw.h:1.6 php-src/main/config.nw.h:1.7 --- php-src/main/config.nw.h:1.6Thu Jan 8 12:33:04 2004 +++ php-src/main/config.nw.hThu Sep 30 11:55:18 2004 @@ -16,16 +16,34 @@ +--+ */ -/* $Id: config.nw.h,v 1.6 2004/01/08 17:33:04 sniper Exp $ */ +/* $Id: config.nw.h,v 1.7 2004/09/30 15:55:18 hyanantha Exp $ */ /* config.nw.h. Configure file for NetWare platform */ +#ifndef CONFIG_NW_H +#define CONFIG_NW_H +#define HAVE_GLOB 1 +#define HAVE_FTOK 1 +#define HAVE_SYS_IPC_H 1 +#define HAVE_REALPATH 1 +#define HAVE_FNMATCH 1 +#define HAVE_HYPOT 1 +#define HAVE_STRCOLL 1 +#define HAVE_NANOSLEEP 1 +#define HAVE_GETOPT 1 +#define SUPPORT_UTF8 1 +#define HAVE_NL_LANGINFO 1 +#define HAVE_LANGINFO_H 1 +#define HAVE_SYSLOG_H 1 +#define HAVE_XML 1 +#define HAVE_SYS_TIME_H 1 +#define HAVE_SETLOCALE 1 +#define PHP_CAN_SUPPORT_PROC_OPEN 1 /* Define if PHP to setup it's own SIGCHLD handler (not needed on NetWare) */ #define PHP_SIGCHILD 0 -/* dns functions found in resolv.lib */ -#define HAVE_LIBBIND 1 +#undef HAVE_LIBBIND #define HAVE_GETSERVBYNAME 1 #define HAVE_GETSERVBYPORT 1 @@ -44,6 +62,7 @@ /* set to enable SNMP */ /*#define HAVE_SNMP 1*/ +#define HAVE_OPENSSL_EXT 1 /* defines for PostgreSQL extension */ #define HAVE_PGSQL 1 #define PHP_PGSQL_PRIVATE 1 @@ -60,8 +79,11 @@ #define HAVE_WDDX 0 /* set to enable the crypt command */ -/* #define HAVE_CRYPT 1 */ -/* #define HAVE_CRYPT_H 1 */ +#define HAVE_CRYPT 1 +#define PHP_STD_DES_CRYPT 1 +#define PHP_EXT_DES_CRYPT 0 +#define PHP_MD5_CRYPT 1 +#define PHP_BLOWFISH_CRYPT 0 /* set to enable force cgi redirect */ #define FORCE_CGI_REDIRECT 0 @@ -98,7 +120,7 @@ /* The following may or may not be (or need to be) ported to the - windows environment. + NetWare environment. ---*/ /* Define if you have the link function. */ @@ -149,17 +171,14 @@ /* Though we have alloca(), this seems to be causing some problem with the stack pointer -- hence not using it */ /* #define HAVE_ALLOCA 1 */ -/* Define if you have sys/time.h */ -#undef HAVE_SYS_TIME_H - /* Define if you have signal.h */ #define HAVE_SIGNAL_H 1 /* Define if your struct stat has st_blksize. */ -#define HAVE_ST_BLKSIZE +#define HAVE_ST_BLKSIZE 1 /* Define if your struct stat has st_blocks. */ -#define HAVE_ST_BLOCKS +#define HAVE_ST_BLOCKS 1 /* Define if your struct stat has st_rdev. */ #define HAVE_ST_RDEV 1 @@ -196,9 +215,6 @@ /* Define if you have the regcomp function. */ #define HAVE_REGCOMP 1 -/* Define if you have the setlocale function. */ -/* #define HAVE_SETLOCALE 1 *//* LibC doesn't seem to be supporting fully -- hence commenting for now */ - #define HAVE_LOCALECONV 1 #define HAVE_LOCALE_H 1 @@ -277,12 +293,6 @@ #define HAVE_STRFTIME 1 -/* Defined since unsetenv function is defined in LibC. - * This is used to destroy env values in the function php_putenv_destructor. - * If we do not use unsetenv, then the environment variables are directlt manipulated. - * This will then result in LibC not being able to do the maintenance - * that is required for NetWare. - */ #define HAVE_UNSETENV 1 /* Default directory for loading extensions. */ @@ -295,7 +305,11 @@ /* This is the default configuration file to read */ #define CONFIGURATION_FILE_PATH php.ini +#ifdef APACHE_2_BUILD +#define APACHE_MODULE_DIR sys:/apache2/modules +#else #define APACHE_MODULE_DIR sys:/apache/modules +#endif #define PHP_BINDIR sys:/php #define PHP_LIBDIR PHP_BINDIR #define PHP_DATADIR PHP_BINDIR @@ -304,13 +318,14 @@ #define PHP_CONFIG_FILE_PATH sys:/php #define PEAR_INSTALLDIR sys:/php/pear -#define PHP_CONFIG_FILE_SCAN_DIR NULL +#define PHP_CONFIG_FILE_SCAN_DIR #define PHP_EXTENSION_DIR sys:/php/ext -#define PHP_INCLUDE_PATH NULL +#define PHP_INCLUDE_PATH .;sys:/php/includes #define PHP_PREFIX sys:/php #define PHP_SHLIB_SUFFIX nlm #define USE_CONFIG_FILE 1 +#endif -- 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) /tests/reflection parameters_001.phpt
iliaa Thu Sep 30 17:54:28 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/tests/reflection parameters_001.phpt
Log:
Added skip condition for PHP 5.0
http://cvs.php.net/diff.php/php-src/tests/reflection/parameters_001.phpt?r1=1.3.2.1r2=1.3.2.2ty=u
Index: php-src/tests/reflection/parameters_001.phpt
diff -u php-src/tests/reflection/parameters_001.phpt:1.3.2.1
php-src/tests/reflection/parameters_001.phpt:1.3.2.2
--- php-src/tests/reflection/parameters_001.phpt:1.3.2.1Mon Sep 27 15:02:23
2004
+++ php-src/tests/reflection/parameters_001.phptThu Sep 30 17:54:28 2004
@@ -1,5 +1,13 @@
--TEST--
Check for parameter being optional
+--SKIPIF--
+?php
+ class a { function b() {} }
+ $a = new ReflectionMethod('a','b');
+ if (!method_exists($a, 'getNumberOfRequiredParameters')) {
+ exit(skip getNumberOfRequiredParameters is only in PHP 5.1+);
+ }
+?
--FILE--
?php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
