[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/exif/exif.c branches/PHP_5_3/ext/session/mod_files.c branches/PHP_5_3/ext/session/session.c branches/PHP_5_3/ext/standard/file.c branches/PHP_5_3/ext/
guenter Tue, 03 Nov 2009 21:21:34 +
Revision: http://svn.php.net/viewvc?view=revision&revision=290190
Log:
removed now obsolete NetWare hack since I fixed this
with Novell some longer time ago in their SDK header.
Changed paths:
U php/php-src/branches/PHP_5_3/ext/exif/exif.c
U php/php-src/branches/PHP_5_3/ext/session/mod_files.c
U php/php-src/branches/PHP_5_3/ext/session/session.c
U php/php-src/branches/PHP_5_3/ext/standard/file.c
U php/php-src/branches/PHP_5_3/ext/standard/filestat.c
U php/php-src/branches/PHP_5_3/ext/standard/ftp_fopen_wrapper.c
U php/php-src/branches/PHP_5_3/ext/standard/pageinfo.c
U php/php-src/trunk/ext/exif/exif.c
U php/php-src/trunk/ext/session/mod_files.c
U php/php-src/trunk/ext/session/session.c
U php/php-src/trunk/ext/standard/file.c
U php/php-src/trunk/ext/standard/filestat.c
U php/php-src/trunk/ext/standard/ftp_fopen_wrapper.c
U php/php-src/trunk/ext/standard/pageinfo.c
Modified: php/php-src/branches/PHP_5_3/ext/exif/exif.c
===
--- php/php-src/branches/PHP_5_3/ext/exif/exif.c 2009-11-03 20:06:56 UTC (rev 290189)
+++ php/php-src/branches/PHP_5_3/ext/exif/exif.c 2009-11-03 21:21:34 UTC (rev 290190)
@@ -3876,11 +3876,7 @@
}
/* Store file date/time. */
-#ifdef NETWARE
- ImageInfo->FileDateTime = st.st_mtime.tv_sec;
-#else
ImageInfo->FileDateTime = st.st_mtime;
-#endif
ImageInfo->FileSize = st.st_size;
/*exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "Opened stream is file: %d", ImageInfo->FileSize);*/
}
Modified: php/php-src/branches/PHP_5_3/ext/session/mod_files.c
===
--- php/php-src/branches/PHP_5_3/ext/session/mod_files.c 2009-11-03 20:06:56 UTC (rev 290189)
+++ php/php-src/branches/PHP_5_3/ext/session/mod_files.c 2009-11-03 21:21:34 UTC (rev 290190)
@@ -244,11 +244,7 @@
/* 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++;
}
Modified: php/php-src/branches/PHP_5_3/ext/session/session.c
===
--- php/php-src/branches/PHP_5_3/ext/session/session.c 2009-11-03 20:06:56 UTC (rev 290189)
+++ php/php-src/branches/PHP_5_3/ext/session/session.c 2009-11-03 21:21:34 UTC (rev 290190)
@@ -61,12 +61,6 @@
* Helpers *
*** */
-#ifdef NETWARE
-# define SESS_SB_MTIME(sb) ((sb).st_mtime.tv_sec)
-#else
-# define SESS_SB_MTIME(sb) ((sb).st_mtime)
-#endif
-
#define IF_SESSION_VARS() \
if (PS(http_session_vars) && PS(http_session_vars)->type == IS_ARRAY)
@@ -1095,7 +1089,7 @@
#define LAST_MODIFIED "Last-Modified: "
memcpy(buf, LAST_MODIFIED, sizeof(LAST_MODIFIED) - 1);
- strcpy_gmt(buf + sizeof(LAST_MODIFIED) - 1, &SESS_SB_MTIME(sb));
+ strcpy_gmt(buf + sizeof(LAST_MODIFIED) - 1, &sb.st_mtime);
ADD_HEADER(buf);
}
}
Modified: php/php-src/branches/PHP_5_3/ext/standard/file.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/file.c 2009-11-03 20:06:56 UTC (rev 290189)
+++ php/php-src/branches/PHP_5_3/ext/standard/file.c 2009-11-03 21:21:34 UTC (rev 290190)
@@ -50,16 +50,6 @@
# include "win32/param.h"
# include "win32/winutil.h"
# include "win32/fnmatch.h"
-#elif defined(NETWARE)
-# include
-# include
-# ifdef USE_WINSOCK
-# include
-# else
-# include
-# include
-# include
-# endif
#else
# if HAVE_SYS_PARAM_H
# include
@@ -1636,16 +1626,9 @@
MAKE_LONG_ZVAL_INCREF(stat_rdev, -1);
#endif
MAKE_LONG_ZVAL_INCREF(stat_size, stat_ssb.sb.st_size);
-#ifdef NETWARE
- MAKE_LONG_ZVAL_INCREF(stat_atime, stat_ssb.sb.st_atime.tv_sec);
- MAKE_LONG_ZVAL_INCREF(stat_mtime, stat_ssb.sb.st_mtime.tv_sec);
- MAKE_LONG_ZVAL_INCREF(stat_ctime, stat_ssb.sb.st_ctime.tv_sec);
-#else
MAKE_LONG_ZVAL_INCREF(stat_atime, stat_ssb.sb.st_atime);
MAKE_LONG_ZVAL_INCREF(stat_mtime, stat_ssb.sb.st_mtime);
MAKE_LONG_ZVAL_INCREF(stat_ctime, stat_ssb.sb.st_ctime);
-#endif
-
#ifdef HAVE_ST_BLKSIZE
MAKE_LONG_ZVAL_INCREF(stat_blksize, stat_ssb.sb.st_blksize);
#else
Modified: php/php-src/branches/PHP_5_3/ext/standard/filestat.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/filestat.c 2009-11-03 20:06:56 UTC (rev 290189)
+++ php/php-src/branches/PHP_5_3/ext/standard/filestat.c 2009-11-03 21:21:34 UTC (rev 290190)
@@ -386,7 +386,7 @@
}
/* }}} */
-#if !defined(WINDOWS)
+#if !defined(WINDOWS) && !defined(NETWARE)
static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{ */
{
char *filename;
@@ -487,7 +487,7 @@
/* }}} */
#endif /* !NETWARE */
-#if !defined(WIN
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/openssl/openssl.c trunk/ext/openssl/openssl.c
guenter Tue, 03 Nov 2009 21:26:39 + Revision: http://svn.php.net/viewvc?view=revision&revision=290191 Log: added timezone define for NetWare. Changed paths: U php/php-src/branches/PHP_5_3/ext/openssl/openssl.c U php/php-src/trunk/ext/openssl/openssl.c Modified: php/php-src/branches/PHP_5_3/ext/openssl/openssl.c === --- php/php-src/branches/PHP_5_3/ext/openssl/openssl.c 2009-11-03 21:21:34 UTC (rev 290190) +++ php/php-src/branches/PHP_5_3/ext/openssl/openssl.c 2009-11-03 21:26:39 UTC (rev 290191) @@ -51,6 +51,10 @@ /* Common */ #include +#ifdef NETWARE +#define timezone _timezone /* timezone is called _timezone in LibC */ +#endif + #define DEFAULT_KEY_LENGTH 512 #define MIN_KEY_LENGTH 384 Modified: php/php-src/trunk/ext/openssl/openssl.c === --- php/php-src/trunk/ext/openssl/openssl.c 2009-11-03 21:21:34 UTC (rev 290190) +++ php/php-src/trunk/ext/openssl/openssl.c 2009-11-03 21:26:39 UTC (rev 290191) @@ -48,6 +48,10 @@ #include #include +#ifdef NETWARE +#define timezone _timezone /* timezone is called _timezone in LibC */ +#endif + #define DEFAULT_KEY_LENGTH 512 #define MIN_KEY_LENGTH 384 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/ NEWS configure.in main/php_version.h
On Tue, 2009-11-03 at 10:51 -0500, Ilia Alshanetsky wrote: > PHP 5.3.1RC3 perhaps? Right - the commit itself looks fine, though. johannes > On 2009-11-03, at 10:36 AM, Johannes Schlüter wrote: > > > PHP 5.3.0RC3 > > -- 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/main/ internal_functions_nw.c
guenter Tue, 03 Nov 2009 19:03:49 +
Revision: http://svn.php.net/viewvc?view=revision&revision=290185
Log:
fixed build-in module list for NetWare.
Changed paths:
U php/php-src/branches/PHP_5_2/main/internal_functions_nw.c
Modified: php/php-src/branches/PHP_5_2/main/internal_functions_nw.c
===
--- php/php-src/branches/PHP_5_2/main/internal_functions_nw.c 2009-11-03
18:56:47 UTC (rev 290184)
+++ php/php-src/branches/PHP_5_2/main/internal_functions_nw.c 2009-11-03
19:03:49 UTC (rev 290185)
@@ -38,7 +38,7 @@
#include "ext/standard/head.h"
#include "ext/standard/pack.h"
#include "ext/standard/php_browscap.h"
-/*#include "ext/standard/php_crypt.h"*/
+#include "ext/standard/php_crypt.h"
#include "ext/standard/php_dir.h"
#include "ext/standard/php_filestat.h"
#include "ext/standard/php_mail.h"
@@ -48,16 +48,25 @@
#include "ext/standard/php_array.h"
#include "ext/standard/php_assert.h"
#include "ext/calendar/php_calendar.h"
+#include "ext/date/php_date.h"
/*#include "ext/com/php_COM.h"
#include "ext/com/php_VARIANT.h"*/
#include "ext/ftp/php_ftp.h"
#include "ext/standard/reg.h"
+#include "ext/netware/php_netware.h"
#include "ext/pcre/php_pcre.h"
+#include "ext/reflection/php_reflection.h"
/*#include "ext/odbc/php_odbc.h"*/ /* Commented out for now */
#include "ext/session/php_session.h"
/*#include "ext/xml/php_xml.h"
#include "ext/wddx/php_wddx.h"
#include "ext/mysql/php_mysql.h"*/ /* Commented out for now */
+#if HAVE_OPENSSL_EXT
+#include "ext/openssl/php_openssl.h"
+#endif
+#if HAVE_ZLIB
+#include "ext/zlib/php_zlib.h"
+#endif
/* }}} */
/* {{{ php_builtin_extensions[]
@@ -68,17 +77,26 @@
phpext_bcmath_ptr,
#endif
phpext_calendar_ptr,
+ phpext_date_ptr,
/* COM_module_ptr,*/
phpext_ftp_ptr,
#if defined(MBSTR_ENC_TRANS)
phpext_mbstring_ptr,
#endif
/* phpext_mysql_ptr,*/ /* Commented out for now */
+#if HAVE_OPENSSL_EXT
+ phpext_openssl_ptr,
+#endif
/* phpext_odbc_ptr, */ /* Commented out for now */
phpext_pcre_ptr,
+ phpext_reflection_ptr,
phpext_session_ptr,
/* phpext_xml_ptr,
phpext_wddx_ptr */ /* Commented out for now */
+#if HAVE_ZLIB
+ phpext_zlib_ptr,
+#endif
+ phpext_netware_ptr
};
/* }}} */
--
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/ext/mime_magic/ mime_magic.c
guenter Tue, 03 Nov 2009 18:44:11 + Revision: http://svn.php.net/viewvc?view=revision&revision=290183 Log: added magic.mine path define for NetWare. Changed paths: U php/php-src/branches/PHP_5_2/ext/mime_magic/mime_magic.c Modified: php/php-src/branches/PHP_5_2/ext/mime_magic/mime_magic.c === --- php/php-src/branches/PHP_5_2/ext/mime_magic/mime_magic.c2009-11-03 18:35:46 UTC (rev 290182) +++ php/php-src/branches/PHP_5_2/ext/mime_magic/mime_magic.c2009-11-03 18:44:11 UTC (rev 290183) @@ -166,6 +166,8 @@ #ifdef PHP_WIN32 #define PHP_MIME_MAGIC_FILE_PATH PHP_PREFIX "\\magic.mime" +#elif NETWARE +#define PHP_MIME_MAGIC_FILE_PATH PHP_PREFIX "/magic.mime" #endif #define BYTE 1 -- 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/ext/standard/ ftp_fopen_wrapper.c
guenter Tue, 03 Nov 2009 17:58:17 +
Revision: http://svn.php.net/viewvc?view=revision&revision=290178
Log:
removed now obsolete NetWare hack since I fixed this
with Novell some longer time ago in their SDK header.
Changed paths:
U php/php-src/branches/PHP_5_2/ext/standard/ftp_fopen_wrapper.c
Modified: php/php-src/branches/PHP_5_2/ext/standard/ftp_fopen_wrapper.c
===
--- php/php-src/branches/PHP_5_2/ext/standard/ftp_fopen_wrapper.c
2009-11-03 17:50:10 UTC (rev 290177)
+++ php/php-src/branches/PHP_5_2/ext/standard/ftp_fopen_wrapper.c
2009-11-03 17:58:17 UTC (rev 290178)
@@ -836,32 +836,19 @@
tm.tm_sec += stamp - mktime(gmt);
tm.tm_isdst = gmt->tm_isdst;
-#ifdef NETWARE
- ssb->sb.st_mtime.tv_sec = mktime(&tm);
-#else
ssb->sb.st_mtime = mktime(&tm);
-#endif
} else {
/* error or unsupported command */
mdtm_error:
-#ifdef NETWARE
- ssb->sb.st_mtime.tv_sec = -1;
-#else
ssb->sb.st_mtime = -1;
-#endif
}
ssb->sb.st_ino = 0; /*
Unknown values */
ssb->sb.st_dev = 0;
ssb->sb.st_uid = 0;
ssb->sb.st_gid = 0;
-#ifdef NETWARE
- ssb->sb.st_atime.tv_sec = -1;
- ssb->sb.st_ctime.tv_sec = -1;
-#else
ssb->sb.st_atime = -1;
ssb->sb.st_ctime = -1;
-#endif
ssb->sb.st_nlink = 1;
ssb->sb.st_rdev = -1;
--
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_1/ NEWS configure.in main/php_version.h
johannes Tue, 03 Nov 2009 19:16:27 + Revision: http://svn.php.net/viewvc?view=revision&revision=290187 Log: Back to -dev Changed paths: U php/php-src/branches/PHP_5_3_1/NEWS U php/php-src/branches/PHP_5_3_1/configure.in U php/php-src/branches/PHP_5_3_1/main/php_version.h Modified: php/php-src/branches/PHP_5_3_1/NEWS === --- php/php-src/branches/PHP_5_3_1/NEWS 2009-11-03 19:14:49 UTC (rev 290186) +++ php/php-src/branches/PHP_5_3_1/NEWS 2009-11-03 19:16:27 UTC (rev 290187) @@ -1,5 +1,8 @@ PHPNEWS ||| +?? ??? 2009, PHP 5.3.1 RC4 + + 03 Nov 2009, PHP 5.3.1 RC3 - Added "max_file_uploads" INI directive, which can be set to limit the number of file uploads per-request to 100 by default, to prevent possible Modified: php/php-src/branches/PHP_5_3_1/configure.in === --- php/php-src/branches/PHP_5_3_1/configure.in 2009-11-03 19:14:49 UTC (rev 290186) +++ php/php-src/branches/PHP_5_3_1/configure.in 2009-11-03 19:16:27 UTC (rev 290187) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 PHP_RELEASE_VERSION=1 -PHP_EXTRA_VERSION="RC3" +PHP_EXTRA_VERSION="RC4-dev" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` Modified: php/php-src/branches/PHP_5_3_1/main/php_version.h === --- php/php-src/branches/PHP_5_3_1/main/php_version.h 2009-11-03 19:14:49 UTC (rev 290186) +++ php/php-src/branches/PHP_5_3_1/main/php_version.h 2009-11-03 19:16:27 UTC (rev 290187) @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 1 -#define PHP_EXTRA_VERSION "RC3" -#define PHP_VERSION "5.3.1RC3" +#define PHP_EXTRA_VERSION "RC4-dev" +#define PHP_VERSION "5.3.1RC4-dev" #define PHP_VERSION_ID 50301 -- 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/ext/standard/ file.c
guenter Tue, 03 Nov 2009 17:38:44 + Revision: http://svn.php.net/viewvc?view=revision&revision=290176 Log: removed now obsolete NetWare hack since I fixed this with Novell some longer time ago in their SDK header. Changed paths: U php/php-src/branches/PHP_5_2/ext/standard/file.c Modified: php/php-src/branches/PHP_5_2/ext/standard/file.c === --- php/php-src/branches/PHP_5_2/ext/standard/file.c2009-11-03 17:32:58 UTC (rev 290175) +++ php/php-src/branches/PHP_5_2/ext/standard/file.c2009-11-03 17:38:44 UTC (rev 290176) @@ -1693,16 +1693,9 @@ MAKE_LONG_ZVAL_INCREF(stat_rdev, -1); #endif MAKE_LONG_ZVAL_INCREF(stat_size, stat_ssb.sb.st_size); -#ifdef NETWARE - MAKE_LONG_ZVAL_INCREF(stat_atime, stat_ssb.sb.st_atime.tv_sec); - MAKE_LONG_ZVAL_INCREF(stat_mtime, stat_ssb.sb.st_mtime.tv_sec); - MAKE_LONG_ZVAL_INCREF(stat_ctime, stat_ssb.sb.st_ctime.tv_sec); -#else MAKE_LONG_ZVAL_INCREF(stat_atime, stat_ssb.sb.st_atime); MAKE_LONG_ZVAL_INCREF(stat_mtime, stat_ssb.sb.st_mtime); MAKE_LONG_ZVAL_INCREF(stat_ctime, stat_ssb.sb.st_ctime); -#endif - #ifdef HAVE_ST_BLKSIZE MAKE_LONG_ZVAL_INCREF(stat_blksize, stat_ssb.sb.st_blksize); #else -- 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/ext/openssl/ openssl.c
guenter Tue, 03 Nov 2009 18:24:57 + Revision: http://svn.php.net/viewvc?view=revision&revision=290180 Log: added timezone define for NetWare. Changed paths: U php/php-src/branches/PHP_5_2/ext/openssl/openssl.c Modified: php/php-src/branches/PHP_5_2/ext/openssl/openssl.c === --- php/php-src/branches/PHP_5_2/ext/openssl/openssl.c 2009-11-03 18:03:02 UTC (rev 290179) +++ php/php-src/branches/PHP_5_2/ext/openssl/openssl.c 2009-11-03 18:24:57 UTC (rev 290180) @@ -49,6 +49,10 @@ /* Common */ #include +#ifdef NETWARE +#define timezone _timezone /* timezone is called _timezone in LibC */ +#endif + #define DEFAULT_KEY_LENGTH 512 #define MIN_KEY_LENGTH 384 -- 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/ext/session/ session.c
guenter Tue, 03 Nov 2009 17:32:58 + Revision: http://svn.php.net/viewvc?view=revision&revision=290175 Log: removed now obsolete NetWare hack since I fixed this with Novell some longer time ago in their SDK header. Changed paths: U php/php-src/branches/PHP_5_2/ext/session/session.c Modified: php/php-src/branches/PHP_5_2/ext/session/session.c === --- php/php-src/branches/PHP_5_2/ext/session/session.c 2009-11-03 17:16:45 UTC (rev 290174) +++ php/php-src/branches/PHP_5_2/ext/session/session.c 2009-11-03 17:32:58 UTC (rev 290175) @@ -61,12 +61,6 @@ * Helpers * *** */ -#ifdef NETWARE -# define SESS_SB_MTIME(sb) ((sb).st_mtime.tv_sec) -#else -# define SESS_SB_MTIME(sb) ((sb).st_mtime) -#endif - #define IF_SESSION_VARS() \ if (PS(http_session_vars) && PS(http_session_vars)->type == IS_ARRAY) @@ -1013,7 +1007,7 @@ #define LAST_MODIFIED "Last-Modified: " memcpy(buf, LAST_MODIFIED, sizeof(LAST_MODIFIED) - 1); - strcpy_gmt(buf + sizeof(LAST_MODIFIED) - 1, &SESS_SB_MTIME(sb)); + strcpy_gmt(buf + sizeof(LAST_MODIFIED) - 1, &sb.st_mtime); ADD_HEADER(buf); } } -- 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/ext/standard/ filestat.c
guenter Tue, 03 Nov 2009 17:50:10 +
Revision: http://svn.php.net/viewvc?view=revision&revision=290177
Log:
removed now obsolete NetWare hack since I fixed this
with Novell some longer time ago in their SDK header.
Changed paths:
U php/php-src/branches/PHP_5_2/ext/standard/filestat.c
Modified: php/php-src/branches/PHP_5_2/ext/standard/filestat.c
===
--- php/php-src/branches/PHP_5_2/ext/standard/filestat.c2009-11-03
17:38:44 UTC (rev 290176)
+++ php/php-src/branches/PHP_5_2/ext/standard/filestat.c2009-11-03
17:50:10 UTC (rev 290177)
@@ -386,7 +386,7 @@
}
/* }}} */
-#if !defined(WINDOWS)
+#if !defined(WINDOWS) && !defined(NETWARE)
static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{ */
{
zval **filename, **group;
@@ -871,23 +871,11 @@
case FS_GROUP:
RETURN_LONG((long)ssb.sb.st_gid);
case FS_ATIME:
-#ifdef NETWARE
- RETURN_LONG((long)ssb.sb.st_atime.tv_sec);
-#else
RETURN_LONG((long)ssb.sb.st_atime);
-#endif
case FS_MTIME:
-#ifdef NETWARE
- RETURN_LONG((long)ssb.sb.st_mtime.tv_sec);
-#else
RETURN_LONG((long)ssb.sb.st_mtime);
-#endif
case FS_CTIME:
-#ifdef NETWARE
- RETURN_LONG((long)ssb.sb.st_ctime.tv_sec);
-#else
RETURN_LONG((long)ssb.sb.st_ctime);
-#endif
case FS_TYPE:
if (S_ISLNK(ssb.sb.st_mode)) {
RETURN_STRING("link", 1);
@@ -935,15 +923,9 @@
MAKE_LONG_ZVAL_INCREF(stat_rdev, -1);
#endif
MAKE_LONG_ZVAL_INCREF(stat_size, stat_sb->st_size);
-#ifdef NETWARE
- MAKE_LONG_ZVAL_INCREF(stat_atime, (stat_sb->st_atime).tv_sec);
- MAKE_LONG_ZVAL_INCREF(stat_mtime, (stat_sb->st_mtime).tv_sec);
- MAKE_LONG_ZVAL_INCREF(stat_ctime, (stat_sb->st_ctime).tv_sec);
-#else
MAKE_LONG_ZVAL_INCREF(stat_atime, stat_sb->st_atime);
MAKE_LONG_ZVAL_INCREF(stat_mtime, stat_sb->st_mtime);
MAKE_LONG_ZVAL_INCREF(stat_ctime, stat_sb->st_ctime);
-#endif
#ifdef HAVE_ST_BLKSIZE
MAKE_LONG_ZVAL_INCREF(stat_blksize, stat_sb->st_blksize);
#else
--
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/ext/standard/ pageinfo.c
guenter Tue, 03 Nov 2009 18:03:02 +
Revision: http://svn.php.net/viewvc?view=revision&revision=290179
Log:
removed now obsolete NetWare hack since I fixed this
with Novell some longer time ago in their SDK header.
Changed paths:
U php/php-src/branches/PHP_5_2/ext/standard/pageinfo.c
Modified: php/php-src/branches/PHP_5_2/ext/standard/pageinfo.c
===
--- php/php-src/branches/PHP_5_2/ext/standard/pageinfo.c2009-11-03
17:58:17 UTC (rev 290178)
+++ php/php-src/branches/PHP_5_2/ext/standard/pageinfo.c2009-11-03
18:03:02 UTC (rev 290179)
@@ -68,11 +68,7 @@
BG(page_uid) = pstat->st_uid;
BG(page_gid) = pstat->st_gid;
BG(page_inode) = pstat->st_ino;
-#ifdef NETWARE
- BG(page_mtime) = (pstat->st_mtime).tv_sec;
-#else
BG(page_mtime) = pstat->st_mtime;
-#endif
} else { /* handler for situations where there is no source
file, ex. php -r */
BG(page_uid) = getuid();
BG(page_gid) = getgid();
--
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/ext/standard/ file.c
guenter Tue, 03 Nov 2009 18:56:47 + Revision: http://svn.php.net/viewvc?view=revision&revision=290184 Log: cleaned up includes for NetWare. Changed paths: U php/php-src/branches/PHP_5_2/ext/standard/file.c Modified: php/php-src/branches/PHP_5_2/ext/standard/file.c === --- php/php-src/branches/PHP_5_2/ext/standard/file.c2009-11-03 18:44:11 UTC (rev 290183) +++ php/php-src/branches/PHP_5_2/ext/standard/file.c2009-11-03 18:56:47 UTC (rev 290184) @@ -48,17 +48,7 @@ #define O_RDONLY _O_RDONLY #include "win32/param.h" #include "win32/winutil.h" -#elif defined(NETWARE) -#include -#include -#ifdef USE_WINSOCK -#include #else -#include -#include -#include -#endif -#else #if HAVE_SYS_PARAM_H #include #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ext/exif/ exif.c
hi Guenter! Merge to other branches? Cheers, On Tue, Nov 3, 2009 at 6:11 PM, Guenter Knauf wrote: > guenter Tue, 03 Nov 2009 17:11:09 + > > Revision: http://svn.php.net/viewvc?view=revision&revision=290173 > > Log: > removed now obsolete NetWare hack since I fixed this > with Novell some longer tiem ago in their SDK header. > > Changed paths: > U php/php-src/branches/PHP_5_2/ext/exif/exif.c > > Modified: php/php-src/branches/PHP_5_2/ext/exif/exif.c > === > --- php/php-src/branches/PHP_5_2/ext/exif/exif.c 2009-11-03 16:48:52 > UTC (rev 290172) > +++ php/php-src/branches/PHP_5_2/ext/exif/exif.c 2009-11-03 17:11:09 > UTC (rev 290173) > @@ -3881,11 +3881,7 @@ > } > > /* Store file date/time. */ > -#ifdef NETWARE > - ImageInfo->FileDateTime = st.st_mtime.tv_sec; > -#else > ImageInfo->FileDateTime = st.st_mtime; > -#endif > ImageInfo->FileSize = st.st_size; > /*exif_error_docref(NULL EXIFERR_CC, ImageInfo, > E_NOTICE, "Opened stream is file: %d", ImageInfo->FileSize);*/ > } > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > -- 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] svn: /php/php-src/branches/PHP_5_2/ext/session/ mod_files.c
guenter Tue, 03 Nov 2009 17:16:45 +
Revision: http://svn.php.net/viewvc?view=revision&revision=290174
Log:
removed now obsolete NetWare hack since I fixed this
with Novell some longer tiem ago in their SDK header.
Changed paths:
U php/php-src/branches/PHP_5_2/ext/session/mod_files.c
Modified: php/php-src/branches/PHP_5_2/ext/session/mod_files.c
===
--- php/php-src/branches/PHP_5_2/ext/session/mod_files.c2009-11-03
17:11:09 UTC (rev 290173)
+++ php/php-src/branches/PHP_5_2/ext/session/mod_files.c2009-11-03
17:16:45 UTC (rev 290174)
@@ -244,11 +244,7 @@
/* 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] svn: /php/php-src/branches/PHP_5_2/ext/exif/ exif.c
guenter Tue, 03 Nov 2009 17:11:09 + Revision: http://svn.php.net/viewvc?view=revision&revision=290173 Log: removed now obsolete NetWare hack since I fixed this with Novell some longer tiem ago in their SDK header. Changed paths: U php/php-src/branches/PHP_5_2/ext/exif/exif.c Modified: php/php-src/branches/PHP_5_2/ext/exif/exif.c === --- php/php-src/branches/PHP_5_2/ext/exif/exif.c2009-11-03 16:48:52 UTC (rev 290172) +++ php/php-src/branches/PHP_5_2/ext/exif/exif.c2009-11-03 17:11:09 UTC (rev 290173) @@ -3881,11 +3881,7 @@ } /* Store file date/time. */ -#ifdef NETWARE - ImageInfo->FileDateTime = st.st_mtime.tv_sec; -#else ImageInfo->FileDateTime = st.st_mtime; -#endif ImageInfo->FileSize = st.st_size; /*exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "Opened stream is file: %d", ImageInfo->FileSize);*/ } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/tags/
johannes Tue, 03 Nov 2009 16:48:52 + Revision: http://svn.php.net/viewvc?view=revision&revision=290172 Log: PHP 5.3.1RC3 Changed paths: A + php/php-src/tags/php_5_3_1RC3/ (from php/php-src/branches/PHP_5_3_1/:r290171) Property changes on: php/php-src/tags/php_5_3_1RC3 ___ Added: svn:ignore + Makefile.objects Makefile.fragments Makefile acconfig.h aclocal.m4 autom4te.cache bsd_converted buildmk.stamp buildconf.stamp config.h.in config.cache config.log config.status config_vars.mk configuration-parser.c configuration-parser.h configuration-parser.output configuration-scanner.c configure configure.bat conftest conftest.c generated_lists meta_cc meta_ccld mkinstalldirs missing install-sh internal_functions.c libtool shlibtool php php5.spec stamp-h test.php3 *.lo *.la libs modules php-*.tar.gz want_dependencies deps config.nice php_version.h *.plg *.opt *.ncb Release Release_inline Debug Release_TS Release_TSDbg Release_TS_inline Debug_TS results.txt libs _libs include autom4te.cache FBCIndex FBCLockFolder debug.log confdefs.h configure.js config.nice.bat configure.bat ZendEngine1 php_test_results_*.txt *.gcda *.gcno lcov_data lcov_html php_lcov.info tmp-php.ini diff Added: svn:mergeinfo + /php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779,289987,289990,290029,290129,290147 /php/php-src/trunk:284726 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/ NEWS configure.in main/php_version.h
PHP 5.3.1RC3 perhaps? On 2009-11-03, at 10:36 AM, Johannes Schlüter wrote: PHP 5.3.0RC3 -- 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_1/ NEWS configure.in main/php_version.h
johannes Tue, 03 Nov 2009 15:36:55 + Revision: http://svn.php.net/viewvc?view=revision&revision=290171 Log: PHP 5.3.0RC3 Changed paths: U php/php-src/branches/PHP_5_3_1/NEWS U php/php-src/branches/PHP_5_3_1/configure.in U php/php-src/branches/PHP_5_3_1/main/php_version.h Modified: php/php-src/branches/PHP_5_3_1/NEWS === --- php/php-src/branches/PHP_5_3_1/NEWS 2009-11-03 14:56:04 UTC (rev 290170) +++ php/php-src/branches/PHP_5_3_1/NEWS 2009-11-03 15:36:55 UTC (rev 290171) @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2009, PHP 5.3.1 RC3 +03 Nov 2009, PHP 5.3.1 RC3 - Added "max_file_uploads" INI directive, which can be set to limit the number of file uploads per-request to 100 by default, to prevent possible DOS via temporary file exhaustion. (Ilia) Modified: php/php-src/branches/PHP_5_3_1/configure.in === --- php/php-src/branches/PHP_5_3_1/configure.in 2009-11-03 14:56:04 UTC (rev 290170) +++ php/php-src/branches/PHP_5_3_1/configure.in 2009-11-03 15:36:55 UTC (rev 290171) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 PHP_RELEASE_VERSION=1 -PHP_EXTRA_VERSION="RC3-dev" +PHP_EXTRA_VERSION="RC3" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` Modified: php/php-src/branches/PHP_5_3_1/main/php_version.h === --- php/php-src/branches/PHP_5_3_1/main/php_version.h 2009-11-03 14:56:04 UTC (rev 290170) +++ php/php-src/branches/PHP_5_3_1/main/php_version.h 2009-11-03 15:36:55 UTC (rev 290171) @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 1 -#define PHP_EXTRA_VERSION "RC3-dev" -#define PHP_VERSION "5.3.1RC3-dev" +#define PHP_EXTRA_VERSION "RC3" +#define PHP_VERSION "5.3.1RC3" #define PHP_VERSION_ID 50301 -- 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/ext/mysqli/mysqli_api.c branches/PHP_5_3/ext/mysqli/tests/mysqli_options.phpt trunk/ext/mysqli/mysqli_api.c trunk/ext/mysqli/tests/mysqli_options.phpt
uw Tue, 03 Nov 2009 14:56:04 +
Revision: http://svn.php.net/viewvc?view=revision&revision=290170
Log:
Fix for bug #49965 . Let mysqli_options() try to cast option values to the
appropriate type.
Bug: http://bugs.php.net/49965 (Assigned) Setting MYSQLI_OPT_CONNECT_TIMEOUT
does not seem to have an effect on timeout
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_options.phpt
U php/php-src/trunk/ext/mysqli/mysqli_api.c
U php/php-src/trunk/ext/mysqli/tests/mysqli_options.phpt
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c2009-11-03
13:14:33 UTC (rev 290169)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c2009-11-03
14:56:04 UTC (rev 290170)
@@ -1589,6 +1589,66 @@
}
/* }}} */
+/* {{{ mysqli_options_get_option_zval_type */
+static int mysqli_options_get_option_zval_type(int option)
+{
+ switch (option) {
+#ifdef MYSQLI_USE_MYSQLND
+#if PHP_MAJOR_VERSION >= 6
+ case MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE:
+#endif
+ case MYSQLND_OPT_NET_CMD_BUFFER_SIZE:
+ case MYSQLND_OPT_NET_READ_BUFFER_SIZE:
+#ifdef MYSQLND_STRING_TO_INT_CONVERSION
+ case MYSQLND_OPT_INT_AND_FLOAT_NATIVE:
+#endif
+#endif /* MYSQLI_USE_MYSQLND */
+ case MYSQL_OPT_CONNECT_TIMEOUT:
+case MYSQL_REPORT_DATA_TRUNCATION:
+case MYSQL_OPT_LOCAL_INFILE:
+case MYSQL_OPT_NAMED_PIPE:
+#ifdef MYSQL_OPT_PROTOCOL
+case MYSQL_OPT_PROTOCOL:
+#endif /* MySQL 4.1.0 */
+#ifdef MYSQL_OPT_READ_TIMEOUT
+ case MYSQL_OPT_READ_TIMEOUT:
+ case MYSQL_OPT_WRITE_TIMEOUT:
+ case MYSQL_OPT_GUESS_CONNECTION:
+ case MYSQL_OPT_USE_EMBEDDED_CONNECTION:
+ case MYSQL_OPT_USE_REMOTE_CONNECTION:
+ case MYSQL_SECURE_AUTH:
+#endif /* MySQL 4.1.1 */
+#ifdef MYSQL_OPT_RECONNECT
+ case MYSQL_OPT_RECONNECT:
+#endif /* MySQL 5.0.13 */
+#ifdef MYSQL_OPT_SSL_VERIFY_SERVER_CERT
+case MYSQL_OPT_SSL_VERIFY_SERVER_CERT:
+#endif /* MySQL 5.0.23 */
+#ifdef MYSQL_OPT_COMPRESS
+ case MYSQL_OPT_COMPRESS:
+#endif /* mysqlnd @ PHP 5.3.2 */
+ return IS_LONG;
+
+#ifdef MYSQL_SHARED_MEMORY_BASE_NAME
+case MYSQL_SHARED_MEMORY_BASE_NAME:
+#endif /* MySQL 4.1.0 */
+#ifdef MYSQL_SET_CLIENT_IP
+ case MYSQL_SET_CLIENT_IP:
+#endif /* MySQL 4.1.1 */
+ case MYSQL_READ_DEFAULT_FILE:
+ case MYSQL_READ_DEFAULT_GROUP:
+ case MYSQL_INIT_COMMAND:
+ case MYSQL_SET_CHARSET_NAME:
+ case MYSQL_SET_CHARSET_DIR:
+ return IS_STRING;
+
+ default:
+ return IS_NULL;
+ }
+}
+/* }}} */
+
+
/* {{{ proto bool mysqli_options(object link, int flags, mixed values)
Set options */
PHP_FUNCTION(mysqli_options)
@@ -1599,6 +1659,7 @@
longmysql_option;
unsigned intl_value;
longret;
+ int expected_type;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"Olz", &mysql_link, mysqli_link_class_entry, &mysql_option, &mysql_value) ==
FAILURE) {
return;
@@ -1610,16 +1671,30 @@
RETURN_FALSE;
}
}
-
- switch (Z_TYPE_PP(&mysql_value)) {
+ expected_type = mysqli_options_get_option_zval_type(mysql_option);
+ if (expected_type != Z_TYPE_P(mysql_value)) {
+ switch (expected_type) {
+ case IS_STRING:
+ convert_to_string_ex(&mysql_value);
+ break;
+ case IS_LONG:
+ convert_to_long_ex(&mysql_value);
+ break;
+ default:
+ break;
+ }
+ }
+ switch (expected_type) {
case IS_STRING:
ret = mysql_options(mysql->mysql, mysql_option,
Z_STRVAL_PP(&mysql_value));
break;
- default:
- convert_to_long_ex(&mysql_value);
+ case IS_LONG:
l_value = Z_LVAL_PP(&mysql_value);
ret = mysql_options(mysql->mysql, mysql_option, (char
*)&l_value);
break;
+ default:
+ ret = 1;
+ break;
}
RETURN_BOOL(!ret);
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_options.phpt
=
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS
iliaaTue, 03 Nov 2009 13:14:33 + Revision: http://svn.php.net/viewvc?view=revision&revision=290169 Log: TZ update Changed paths: U php/php-src/branches/PHP_5_2/NEWS Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-11-03 12:23:54 UTC (rev 290168) +++ php/php-src/branches/PHP_5_2/NEWS 2009-11-03 13:14:33 UTC (rev 290169) @@ -1,7 +1,7 @@ PHPNEWS ||| ?? ??? 2009, PHP 5.2.12 -- Updated timezone database to version 2009.16 (2009p). (Derick) +- Updated timezone database to version 2009.17 (2009q). (Derick) - Added "max_file_uploads" INI directive, which can be set to limit the number of file uploads per-request to 100 by default, to prevent possible -- 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
scottmac Tue, 03 Nov 2009 12:23:54 + Revision: http://svn.php.net/viewvc?view=revision&revision=290168 Log: BFN 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 2009-11-03 12:15:03 UTC (rev 290167) +++ php/php-src/branches/PHP_5_3/NEWS 2009-11-03 12:23:54 UTC (rev 290168) @@ -1,6 +1,8 @@ PHPNEWS ||| ?? ??? 20??, PHP 5.3.2 +- Upgraded bundled PCRE to version 8.00. (Scott) + - Added "max_file_uploads" INI directive, which can be set to limit the number of file uploads per-request to 100 by default, to prevent possible DOS via temporary file exhaustion. (Ilia) -- 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/ext/pcre/pcrelib/ChangeLog branches/PHP_5_3/ext/pcre/pcrelib/HACKING branches/PHP_5_3/ext/pcre/pcrelib/LICENCE branches/PHP_5_3/ext/pcre/pcrelib/NEWS bran
scottmac Tue, 03 Nov 2009 12:15:03 + Revision: http://svn.php.net/viewvc?view=revision&revision=290167 Log: Update PCRE to 8.00 Changed paths: U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/ChangeLog U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/HACKING U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/LICENCE U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/NEWS U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/NON-UNIX-USE U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/README U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/config.h U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/doc/pcre.txt U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre.h U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_compile.c U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_exec.c U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_fullinfo.c U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_printint.src U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_study.c U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_try_flipped.c U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_ucd.c U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcredemo.c U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcreposix.c U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcreposix.h U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/grepoutput U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testinput1 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testinput10 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testinput2 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testinput3 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testinput4 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testinput5 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testinput6 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testinput7 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testinput8 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testinput9 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testoutput1 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testoutput10 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testoutput2 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testoutput3 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testoutput4 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testoutput5 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testoutput6 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testoutput7 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testoutput8 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testoutput9 U php/php-src/branches/PHP_5_3/ext/pcre/upgrade-pcre.php U php/php-src/trunk/ext/pcre/pcrelib/ChangeLog U php/php-src/trunk/ext/pcre/pcrelib/HACKING U php/php-src/trunk/ext/pcre/pcrelib/LICENCE U php/php-src/trunk/ext/pcre/pcrelib/NEWS U php/php-src/trunk/ext/pcre/pcrelib/NON-UNIX-USE U php/php-src/trunk/ext/pcre/pcrelib/README U php/php-src/trunk/ext/pcre/pcrelib/config.h U php/php-src/trunk/ext/pcre/pcrelib/doc/pcre.txt U php/php-src/trunk/ext/pcre/pcrelib/pcre.h U php/php-src/trunk/ext/pcre/pcrelib/pcre_compile.c U php/php-src/trunk/ext/pcre/pcrelib/pcre_exec.c U php/php-src/trunk/ext/pcre/pcrelib/pcre_fullinfo.c U php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h U php/php-src/trunk/ext/pcre/pcrelib/pcre_printint.src U php/php-src/trunk/ext/pcre/pcrelib/pcre_study.c U php/php-src/trunk/ext/pcre/pcrelib/pcre_try_flipped.c U php/php-src/trunk/ext/pcre/pcrelib/pcre_ucd.c U php/php-src/trunk/ext/pcre/pcrelib/pcredemo.c U php/php-src/trunk/ext/pcre/pcrelib/pcreposix.c U php/php-src/trunk/ext/pcre/pcrelib/pcreposix.h U php/php-src/trunk/ext/pcre/pcrelib/testdata/grepoutput U php/php-src/trunk/ext/pcre/pcrelib/testdata/testinput1 U php/php-src/trunk/ext/pcre/pcrelib/testdata/testinput10 U php/php-src/trunk/ext/pcre/pcrelib/testdata/testinput2 U php/php-src/trunk/ext/pcre/pcrelib/testdata/testinput3 U php/php-src/trunk/ext/pcre/pcrelib/testdata/testinput4 U php/php-src/trunk/ext/pcre/pcrelib/testdata/testinput5 U php/php-src/trunk/ext/pcre/pcrelib/testdata/testinput6 U php/php-src/trunk/ext/pcre/pcrelib/testdata/testinput7 U php/php-src/trunk/ext/pcre/pcrelib/testdata/testinput8 U php/php-src/trunk/ext/pcre/pcrelib/testdata/testinput9 U php/php-src/trunk/ext/pcre/pcrelib/testdata/testoutput1 U php/php-src/
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/TSRM/tsrm_win32.c branches/PHP_5_3_1/TSRM/tsrm_win32.c trunk/TSRM/tsrm_win32.c
pajoye Tue, 03 Nov 2009 10:48:12 +
Revision: http://svn.php.net/viewvc?view=revision&revision=290166
Log:
- fix lenght for alloc and cpy (Kanwal)
Changed paths:
U php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c
U php/php-src/branches/PHP_5_3_1/TSRM/tsrm_win32.c
U php/php-src/trunk/TSRM/tsrm_win32.c
Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c
===
--- php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c 2009-11-03 05:16:21 UTC
(rev 290165)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c 2009-11-03 10:48:12 UTC
(rev 290166)
@@ -111,7 +111,7 @@
char *bucket_key = NULL;
if (!pSid) {
- bucket_key = (char *)HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, strlen(pathname));
+ bucket_key = (char *)HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, strlen(pathname) + 1);
if (!bucket_key) {
return NULL;
}
@@ -123,14 +123,14 @@
return NULL;
}
- bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
strlen(pathname) + strlen(ptcSid));
+ bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
strlen(pathname) + strlen(ptcSid) + 1);
if (!bucket_key) {
LocalFree(ptcSid);
return NULL;
}
memcpy(bucket_key, ptcSid, strlen(ptcSid));
- memcpy(bucket_key + strlen(ptcSid), pathname, strlen(pathname));
+ memcpy(bucket_key + strlen(ptcSid), pathname, strlen(pathname) + 1);
LocalFree(ptcSid);
return bucket_key;
Modified: php/php-src/branches/PHP_5_3_1/TSRM/tsrm_win32.c
===
--- php/php-src/branches/PHP_5_3_1/TSRM/tsrm_win32.c2009-11-03 05:16:21 UTC
(rev 290165)
+++ php/php-src/branches/PHP_5_3_1/TSRM/tsrm_win32.c2009-11-03 10:48:12 UTC
(rev 290166)
@@ -111,7 +111,7 @@
char *bucket_key = NULL;
if (!pSid) {
- bucket_key = (char *)HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, strlen(pathname));
+ bucket_key = (char *)HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, strlen(pathname) + 1);
if (!bucket_key) {
return NULL;
}
@@ -123,14 +123,14 @@
return NULL;
}
- bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
strlen(pathname) + strlen(ptcSid));
+ bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
strlen(pathname) + strlen(ptcSid) + 1);
if (!bucket_key) {
LocalFree(ptcSid);
return NULL;
}
memcpy(bucket_key, ptcSid, strlen(ptcSid));
- memcpy(bucket_key + strlen(ptcSid), pathname, strlen(pathname));
+ memcpy(bucket_key + strlen(ptcSid), pathname, strlen(pathname) + 1);
LocalFree(ptcSid);
return bucket_key;
Modified: php/php-src/trunk/TSRM/tsrm_win32.c
===
--- php/php-src/trunk/TSRM/tsrm_win32.c 2009-11-03 05:16:21 UTC (rev 290165)
+++ php/php-src/trunk/TSRM/tsrm_win32.c 2009-11-03 10:48:12 UTC (rev 290166)
@@ -111,7 +111,7 @@
char *bucket_key = NULL;
if (!pSid) {
- bucket_key = (char *)HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, strlen(pathname));
+ bucket_key = (char *)HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, strlen(pathname) + 1);
if (!bucket_key) {
return NULL;
}
@@ -123,14 +123,14 @@
return NULL;
}
- bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
strlen(pathname) + strlen(ptcSid));
+ bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
strlen(pathname) + strlen(ptcSid) + 1);
if (!bucket_key) {
LocalFree(ptcSid);
return NULL;
}
memcpy(bucket_key, ptcSid, strlen(ptcSid));
- memcpy(bucket_key + strlen(ptcSid), pathname, strlen(pathname));
+ memcpy(bucket_key + strlen(ptcSid), pathname, strlen(pathname) + 1);
LocalFree(ptcSid);
return bucket_key;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
