[PHP-CVS] svn: /php/php-src/trunk/TSRM/ tsrm_virtual_cwd.c
pajoye Mon, 19 Oct 2009 23:43:31 +
Revision: http://svn.php.net/viewvc?view=revision&revision=289782
Log:
- MF53: Fix #48746, improve fix to support all possible cases (see latest
comment in the report)
Bug: http://bugs.php.net/48746 (Assigned) Unable to browse directories within
Junction Points
Changed paths:
U php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
Modified: php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2009-10-19 23:41:14 UTC (rev
289781)
+++ php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2009-10-19 23:43:31 UTC (rev
289782)
@@ -706,10 +706,14 @@
/* File is a reparse point. Get the target */
HANDLE hLink = NULL;
REPARSE_DATA_BUFFER * pbuffer;
- unsigned int retlength = 0, rname_off = 0;
- int bufindex = 0, rname_len = 0, isabsolute = 0;
+ unsigned int retlength = 0;
+ int bufindex = 0, isabsolute = 0;
wchar_t * reparsetarget;
BOOL isVolume = FALSE;
+ char printname[MAX_PATH];
+ char substitutename[MAX_PATH];
+ int printname_len, substitutename_len;
+ int substitutename_off = 0;
if(++(*ll) > LINK_MAX) {
return -1;
@@ -730,33 +734,61 @@
CloseHandle(hLink);
if(pbuffer->ReparseTag == IO_REPARSE_TAG_SYMLINK) {
- rname_len =
pbuffer->SymbolicLinkReparseBuffer.PrintNameLength/2;
- rname_off =
pbuffer->SymbolicLinkReparseBuffer.PrintNameOffset/2;
- if(rname_len <= 0) {
- rname_len =
pbuffer->SymbolicLinkReparseBuffer.SubstituteNameLength/2;
- rname_off =
pbuffer->SymbolicLinkReparseBuffer.SubstituteNameOffset/2;
- }
-
reparsetarget =
pbuffer->SymbolicLinkReparseBuffer.ReparseTarget;
+ printname_len =
pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR);
isabsolute =
(pbuffer->SymbolicLinkReparseBuffer.Flags == 0) ? 1 : 0;
+ if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
+ reparsetarget +
pbuffer->MountPointReparseBuffer.PrintNameOffset / sizeof(WCHAR),
+ printname_len + 1,
+ printname, MAX_PATH, NULL, NULL
+ )) {
+ tsrm_free_alloca(pbuffer,
use_heap_large);
+ return -1;
+ };
+ printname_len =
pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR);
+ printname[printname_len] = 0;
+
+ substitutename_len =
pbuffer->MountPointReparseBuffer.SubstituteNameLength / sizeof(WCHAR);
+ if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
+ reparsetarget +
pbuffer->MountPointReparseBuffer.SubstituteNameOffset / sizeof(WCHAR),
+ substitutename_len + 1,
+ substitutename, MAX_PATH, NULL, NULL
+ )) {
+ tsrm_free_alloca(pbuffer,
use_heap_large);
+ return -1;
+ };
+ substitutename[substitutename_len] = 0;
}
else if(pbuffer->ReparseTag ==
IO_REPARSE_TAG_MOUNT_POINT) {
- rname_len =
pbuffer->MountPointReparseBuffer.PrintNameLength/2;
- rname_off =
pbuffer->MountPointReparseBuffer.PrintNameOffset/2;
- if(rname_len <= 0) {
- rname_len =
pbuffer->MountPointReparseBuffer.SubstituteNameLength/2;
- rname_off =
pbuffer->MountPointReparseBuffer.SubstituteNameOffset/2;
- }
+ isabsolute = 1;
+ reparsetarget =
pbuffer->MountPointReparseBuffer.ReparseTarget;
+ printname_len =
pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR);
+ if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
+ reparsetarget +
pbu
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/TSRM/ tsrm_virtual_cwd.c
pajoye Mon, 19 Oct 2009 23:41:14 +
Revision: http://svn.php.net/viewvc?view=revision&revision=289781
Log:
- MFH: fix realloc usage
Changed paths:
U php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c2009-10-19
23:38:55 UTC (rev 289780)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c2009-10-19
23:41:14 UTC (rev 289781)
@@ -983,6 +983,7 @@
time_t t;
int ret;
int add_slash;
+ void *tmp;
TSRMLS_FETCH();
if (path_length == 0 || path_length >= MAXPATHLEN-1) {
@@ -1127,7 +1128,16 @@
CWD_STATE_COPY(&old_state, state);
state->cwd_length = path_length;
- state->cwd = (char *) realloc(state->cwd, state->cwd_length+1);
+
+ tmp = realloc(state->cwd, state->cwd_length+1);
+ if (tmp == NULL) {
+#if VIRTUAL_CWD_DEBUG
+ fprintf (stderr, "Out of memory\n");
+#endif
+ return 1;
+ }
+ state->cwd = (char *) tmp;
+
memcpy(state->cwd, resolved_path, state->cwd_length+1);
if (verify_path(state)) {
CWD_STATE_FREE(state);
@@ -1139,7 +1149,15 @@
}
} else {
state->cwd_length = path_length;
- state->cwd = (char *) realloc(state->cwd, state->cwd_length+1);
+ tmp = realloc(state->cwd, state->cwd_length+1);
+ if (tmp == NULL) {
+#if VIRTUAL_CWD_DEBUG
+ fprintf (stderr, "Out of memory\n");
+#endif
+ return 1;
+ }
+ state->cwd = (char *) tmp;
+
memcpy(state->cwd, resolved_path, state->cwd_length+1);
ret = 0;
}
--
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 TSRM/tsrm_virtual_cwd.c TSRM/tsrm_win32.c TSRM/tsrm_win32.h tests/security/open_basedir_parse_ini_file.phpt
pajoye Mon, 19 Oct 2009 23:38:55 +
Revision: http://svn.php.net/viewvc?view=revision&revision=289780
Log:
- Merge: Fix ACL support and add support for ACL for TS SAPI. Be sure to get
the impersonated token when the impersonation has been done. Add the SID as
part of the key for the cache (so each SID gets its cache and not previous
requests run under other SID)
Changed paths:
_U php/php-src/branches/PHP_5_3_1/
UU php/php-src/branches/PHP_5_3_1/NEWS
U php/php-src/branches/PHP_5_3_1/TSRM/tsrm_virtual_cwd.c
U php/php-src/branches/PHP_5_3_1/TSRM/tsrm_win32.c
U php/php-src/branches/PHP_5_3_1/TSRM/tsrm_win32.h
_U php/php-src/branches/PHP_5_3_1/ext/mysql/
_U php/php-src/branches/PHP_5_3_1/ext/mysqli/
_U php/php-src/branches/PHP_5_3_1/ext/mysqlnd/
_U php/php-src/branches/PHP_5_3_1/ext/pdo_mysql/
_U php/php-src/branches/PHP_5_3_1/ext/tidy/tests/
_U
php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt
Property changes on: php/php-src/branches/PHP_5_3_1
___
Modified: svn:mergeinfo
- /php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763
/php/php-src/trunk:284726
+ /php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_1/NEWS
===
--- php/php-src/branches/PHP_5_3_1/NEWS 2009-10-19 23:32:07 UTC (rev 289779)
+++ php/php-src/branches/PHP_5_3_1/NEWS 2009-10-19 23:38:55 UTC (rev 289780)
@@ -18,7 +18,12 @@
insensitive (garretts)
- Restored shebang line check to CGI sapi (not checked by scanner anymore).
(Jani)
+- Added support for ACL on Windows for thread safe SAPI (Apache2 for example)
+ and fix its support on NTS. (Pierre)
+- Improve symbolic, mounted volume and junctions support for realpath on
+ Windows. (Pierre)
+
- Fixed bug #49847 (exec() fails to return data inside 2nd parameter, given
output lines >4095 bytes). (Ilia)
- Fixed bug #49809 (time_sleep_until() is not available on OpenSolaris). (Jani)
Property changes on: php/php-src/branches/PHP_5_3_1/NEWS
___
Modified: svn:mergeinfo
- /php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667
/php/php-src/trunk/NEWS:284726
+ /php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667,289779
/php/php-src/trunk/NEWS:284726
Modified: php/php-src/branches/PHP_5_3_1/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/branches/PHP_5_3_1/TSRM/tsrm_virtual_cwd.c 2009-10-19 23:32:07 UTC (rev 289779)
+++ php/php-src/branches/PHP_5_3_1/TSRM/tsrm_virtual_cwd.c 2009-10-19 23:38:55 UTC (rev 289780)
@@ -428,6 +428,31 @@
}
/* }}} */
+#ifdef PHP_WIN32
+static inline unsigned long realpath_cache_key(const char *path, int path_len TSRMLS_DC) /* {{{ */
+{
+ register unsigned long h;
+ char *bucket_key = tsrm_win32_get_path_sid_key(path TSRMLS_CC);
+ char *bucket_key_start = (char *)bucket_key;
+ const char *e = bucket_key + strlen(bucket_key);
+
+ if (!bucket_key) {
+ return 0;
+ }
+
+ for (h = 2166136261U; bucket_key < e;) {
+ h *= 16777619;
+ h ^= *bucket_key++;
+ }
+ /* if no SID were present the path is ret
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c branches/PHP_5_3/TSRM/tsrm_win32.c branches/PHP_5_3/TSRM/tsrm_win32.h trunk/TSRM/tsrm_virtual_cwd.c trunk/TSRM/tsrm_win32.c trunk/
pajoye Mon, 19 Oct 2009 23:32:07 +
Revision: http://svn.php.net/viewvc?view=revision&revision=289779
Log:
- Fix ACL support and add support for ACL for TS SAPI. Be sure to get the
impersonated token when the impersonation has been done. Add the SID as part of
the key for the cache (so each SID gets its cache and not previous requests run
under other SID)
Changed paths:
U php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
U php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c
U php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.h
U php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
U php/php-src/trunk/TSRM/tsrm_win32.c
U php/php-src/trunk/TSRM/tsrm_win32.h
Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c 2009-10-19 22:47:44 UTC (rev 289778)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c 2009-10-19 23:32:07 UTC (rev 289779)
@@ -428,6 +428,31 @@
}
/* }}} */
+#ifdef PHP_WIN32
+static inline unsigned long realpath_cache_key(const char *path, int path_len TSRMLS_DC) /* {{{ */
+{
+ register unsigned long h;
+ char *bucket_key = tsrm_win32_get_path_sid_key(path TSRMLS_CC);
+ char *bucket_key_start = (char *)bucket_key;
+ const char *e = bucket_key + strlen(bucket_key);
+
+ if (!bucket_key) {
+ return 0;
+ }
+
+ for (h = 2166136261U; bucket_key < e;) {
+ h *= 16777619;
+ h ^= *bucket_key++;
+ }
+ /* if no SID were present the path is returned. Otherwise a Heap
+ allocated string is returned. */
+ if (bucket_key_start != path) {
+ LocalFree(bucket_key_start);
+ }
+ return h;
+}
+/* }}} */
+#else
static inline unsigned long realpath_cache_key(const char *path, int path_len) /* {{{ */
{
register unsigned long h;
@@ -441,6 +466,7 @@
return h;
}
/* }}} */
+#endif /* defined(PHP_WIN32) */
CWD_API void realpath_cache_clean(TSRMLS_D) /* {{{ */
{
@@ -461,7 +487,11 @@
CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC) /* {{{ */
{
+#ifdef PHP_WIN32
+ unsigned long key = realpath_cache_key(path, path_len TSRMLS_CC);
+#else
unsigned long key = realpath_cache_key(path, path_len);
+#endif
unsigned long n = key % (sizeof(CWDG(realpath_cache)) / sizeof(CWDG(realpath_cache)[0]));
realpath_cache_bucket **bucket = &CWDG(realpath_cache)[n];
@@ -494,8 +524,12 @@
if (CWDG(realpath_cache_size) + size <= CWDG(realpath_cache_size_limit)) {
realpath_cache_bucket *bucket = malloc(size);
unsigned long n;
-
+
+#ifdef PHP_WIN32
+ bucket->key = realpath_cache_key(path, path_len TSRMLS_CC);
+#else
bucket->key = realpath_cache_key(path, path_len);
+#endif
bucket->path = (char*)bucket + sizeof(realpath_cache_bucket);
memcpy(bucket->path, path, path_len+1);
bucket->path_len = path_len;
@@ -524,7 +558,12 @@
static inline realpath_cache_bucket* realpath_cache_find(const char *path, int path_len, time_t t TSRMLS_DC) /* {{{ */
{
+#ifdef PHP_WIN32
+ unsigned long key = realpath_cache_key(path, path_len TSRMLS_CC);
+#else
unsigned long key = realpath_cache_key(path, path_len);
+#endif
+
unsigned long n = key % (sizeof(CWDG(realpath_cache)) / sizeof(CWDG(realpath_cache)[0]));
realpath_cache_bucket **bucket = &CWDG(realpath_cache)[n];
Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c
===
--- php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c 2009-10-19 22:47:44 UTC (rev 289778)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c 2009-10-19 23:32:07 UTC (rev 289779)
@@ -30,7 +30,7 @@
#include "TSRM.h"
#ifdef TSRM_WIN32
-
+#include
#include "tsrm_win32.h"
#include "tsrm_virtual_cwd.h"
@@ -42,25 +42,21 @@
static void tsrm_win32_ctor(tsrm_win32_globals *globals TSRMLS_DC)
{
- HANDLE process_token = NULL;
-
globals->process = NULL;
globals->shm = NULL;
globals->process_size = 0;
globals->shm_size = 0;
globals->comspec = _strdup((GetVersion()<0x8000)?"cmd.exe":"command.com");
- globals->impersonation_token = NULL;
- /* Access check requires impersonation token. Create a duplicate token. */
- if(OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE | TOKEN_QUERY, &process_token)) {
- DuplicateToken(process_token, SecurityImpersonation, &globals->impersonation_token);
- }
-
- /* impersonation_token will be closed when the process dies */
- if(process_token != NULL) {
- CloseHandle(process_token);
- process_token = NULL;
- }
+ /* Set it to INVALID_HANDLE_VALUE
+ * It will be initialized correctly in tsrm_win32_access or set to
+ * NULL if no impersonation has been done.
+ * the impersonated token can't be set here as the impersonation
+ * will happen later, in fcgi_accept_request (or whatever is the
+ * SAPI being used).
+ */
+ globals->impersonation_token = INVALID_HANDLE_VALUE;
+ globals->impersonation_token_sid = NULL;
}
static void tsrm_win32_dtor(tsrm_win32_globals *
[PHP-CVS] svn: /php/php-src/trunk/win32/build/ mkdist.php
pajoye Mon, 19 Oct 2009 22:47:44 + Revision: http://svn.php.net/viewvc?view=revision&revision=289778 Log: - ws Changed paths: U php/php-src/trunk/win32/build/mkdist.php Modified: php/php-src/trunk/win32/build/mkdist.php === --- php/php-src/trunk/win32/build/mkdist.php2009-10-19 21:51:59 UTC (rev 289777) +++ php/php-src/trunk/win32/build/mkdist.php2009-10-19 22:47:44 UTC (rev 289778) @@ -229,12 +229,12 @@ /* populate reading material */ $text_files = array( - "LICENSE" =>"license.txt", - "NEWS" => "news.txt", + "LICENSE" => "license.txt", + "NEWS" => "news.txt", "README.REDIST.BINS" => "readme-redist-bins.txt", - "php.ini-development" =>"php.ini-development", + "php.ini-development" => "php.ini-development", "php.ini-production" => "php.ini-production", - "win32/install.txt" => "install.txt", + "win32/install.txt" => "install.txt", "win32/pws-php5cgi.reg" => "pws-php5cgi.reg", "win32/pws-php5isapi.reg" => "pws-php5isapi.reg", ); -- 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/ext/standard/tests/file/ file_put_contents_variation5.phpt
johannes Mon, 19 Oct 2009 21:51:59 +
Revision: http://svn.php.net/viewvc?view=revision&revision=289777
Log:
Merge 289776: Fix test
Changed paths:
U
php/php-src/branches/PHP_5_3_1/ext/standard/tests/file/file_put_contents_variation5.phpt
Modified:
php/php-src/branches/PHP_5_3_1/ext/standard/tests/file/file_put_contents_variation5.phpt
===
---
php/php-src/branches/PHP_5_3_1/ext/standard/tests/file/file_put_contents_variation5.phpt
2009-10-19 21:50:08 UTC (rev 289776)
+++
php/php-src/branches/PHP_5_3_1/ext/standard/tests/file/file_put_contents_variation5.phpt
2009-10-19 21:51:59 UTC (rev 289777)
@@ -24,7 +24,7 @@
set_include_path(";; ; ;c:\\rubbish");
runtest();
-chdir(dirname('__FILE__'));
+chdir(dirname(__FILE__));
rmdir($thisTestDir);
--
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/standard/tests/file/file_put_contents_variation5.phpt trunk/ext/standard/tests/file/file_put_contents_variation5.phpt
johannes Mon, 19 Oct 2009 21:50:08 +
Revision: http://svn.php.net/viewvc?view=revision&revision=289776
Log:
Fix test to remove temporary files
Changed paths:
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/file_put_contents_variation5.phpt
U
php/php-src/trunk/ext/standard/tests/file/file_put_contents_variation5.phpt
Modified:
php/php-src/branches/PHP_5_3/ext/standard/tests/file/file_put_contents_variation5.phpt
===
---
php/php-src/branches/PHP_5_3/ext/standard/tests/file/file_put_contents_variation5.phpt
2009-10-19 21:43:34 UTC (rev 289775)
+++
php/php-src/branches/PHP_5_3/ext/standard/tests/file/file_put_contents_variation5.phpt
2009-10-19 21:50:08 UTC (rev 289776)
@@ -24,7 +24,7 @@
set_include_path(";; ; ;c:\\rubbish");
runtest();
-chdir(dirname('__FILE__'));
+chdir(dirname(__FILE__));
rmdir($thisTestDir);
Modified:
php/php-src/trunk/ext/standard/tests/file/file_put_contents_variation5.phpt
===
--- php/php-src/trunk/ext/standard/tests/file/file_put_contents_variation5.phpt
2009-10-19 21:43:34 UTC (rev 289775)
+++ php/php-src/trunk/ext/standard/tests/file/file_put_contents_variation5.phpt
2009-10-19 21:50:08 UTC (rev 289776)
@@ -24,7 +24,7 @@
set_include_path(";; ; ;c:\\rubbish");
runtest();
-chdir(dirname('__FILE__'));
+chdir(dirname(__FILE__));
rmdir($thisTestDir);
--
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 PHP_5_3_1/NEWS PHP_5_3_1/Zend/zend_objects.c PHP_5_3_1/ext/pdo/pdo_dbh.c PHP_5_3_1/ext/pdo/pdo_stmt.c PHP_5_3_1/ext/pdo/tests/pdo_036.phpt
johannes Mon, 19 Oct 2009 21:43:34 +
Revision: http://svn.php.net/viewvc?view=revision&revision=289775
Log:
Merge #289581 (Fixed PDORow and PDOStatement crashes when instantiating throught
Reflection (Felipe)
Bug: http://bugs.php.net/289581 (error getting bug information)
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
UU php/php-src/branches/PHP_5_3_1/NEWS
U php/php-src/branches/PHP_5_3_1/Zend/zend_objects.c
U php/php-src/branches/PHP_5_3_1/ext/pdo/pdo_dbh.c
U php/php-src/branches/PHP_5_3_1/ext/pdo/pdo_stmt.c
A + php/php-src/branches/PHP_5_3_1/ext/pdo/tests/pdo_036.phpt
(from php/php-src/branches/PHP_5_3/ext/pdo/tests/pdo_036.phpt:r289581)
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-10-19 21:16:07 UTC (rev 289774)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-10-19 21:43:34 UTC (rev 289775)
@@ -8,9 +8,6 @@
- Implemented FR #49253 (added support for libcurl's CERTINFO option).
(Linus Nielsen Feltzing )
-- Fixed crash when instantiating PDORow and PDOStatement through Reflection.
- (Felipe)
-
- Fixed bug #49855 (import_request_variables() always returns NULL). (Ilia,
sjoerd at php dot net)
- Fixed bug #49800 (SimpleXML allow (un)serialize() calls without warning).
Modified: php/php-src/branches/PHP_5_3_1/NEWS
===
--- php/php-src/branches/PHP_5_3_1/NEWS 2009-10-19 21:16:07 UTC (rev 289774)
+++ php/php-src/branches/PHP_5_3_1/NEWS 2009-10-19 21:43:34 UTC (rev 289775)
@@ -12,6 +12,8 @@
- Fixed crash in SQLiteDatabase::ArrayQuery() and SQLiteDatabase::SingleQuery()
when calling using Reflection. (Felipe)
+- Fixed crash when instantiating PDORow and PDOStatement through Reflection.
+ (Felipe)
- Changed ini file directives [PATH=](on Win32) and [HOST=](on all) to be case
insensitive (garretts)
- Restored shebang line check to CGI sapi (not checked by scanner anymore).
Property changes on: php/php-src/branches/PHP_5_3_1/NEWS
___
Modified: svn:mergeinfo
- /php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289587,289612,289621-289624,289666-289667
/php/php-src/trunk/NEWS:284726
+ /php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667
/php/php-src/trunk/NEWS:284726
Modified: php/php-src/branches/PHP_5_3_1/Zend/zend_objects.c
===
--- php/php-src/branches/PHP_5_3_1/Zend/zend_objects.c 2009-10-19 21:16:07 UTC (rev 289774)
+++ php/php-src/branches/PHP_5_3_1/Zend/zend_objects.c 2009-10-19 21:43:34 UTC (rev 289775)
@@ -49,7 +49,7 @@
ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handle handle TSRMLS_DC)
{
- zend_function *destructor = object->ce->destructor;
+ zend_function *destructor = object ? object->ce->destructor : NULL;
if (destructor) {
zval *obj;
Modified: php/php-src/branches/PHP_5_3_1/ext/pdo/pdo_dbh.c
===
--- php/php-src/branches/PHP_5_3_1/ext/pdo/pdo_dbh.c 2009-10-19 21:16:07 UTC (rev 289774)
+++ php/php-src/branches/PHP_5_3_1/ext/pdo/pdo_dbh.c 2009-10-19 21:43:34 UTC (rev 289775)
@@ -110,7 +110,7 @@
char *message = NULL;
zval *info = NULL;
- if (dbh->error_mode == PDO_ERRMODE_SILENT) {
+ if (dbh == NULL || dbh->error_mode == PDO_ERRMODE
[PHP-CVS] svn: /php/php-src/branches/ PHP_5_3/NEWS PHP_5_3_1/NEWS
johannes Mon, 19 Oct 2009 21:16:07 + Revision: http://svn.php.net/viewvc?view=revision&revision=289774 Log: Merge NEWS for merged stuff from PHP_5_3 to PHP_5_3_1 Changed paths: U php/php-src/branches/PHP_5_3/NEWS UU php/php-src/branches/PHP_5_3_1/NEWS Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2009-10-19 20:12:59 UTC (rev 289773) +++ php/php-src/branches/PHP_5_3/NEWS 2009-10-19 21:16:07 UTC (rev 289774) @@ -1,11 +1,6 @@ PHPNEWS ||| ?? ??? 20??, PHP 5.3.2 -- Upgraded bundled sqlite to version 3.6.19. (Scott) - -- Changed ini file directives [PATH=] (on Win32) and [HOST=] (on all OSes) to - be case insensitive. (Garretts) - - Added ReflectionMethod::setAccessible() for invoking non-public methods through the Reflection API. (Sebastian) @@ -13,243 +8,21 @@ - Implemented FR #49253 (added support for libcurl's CERTINFO option). (Linus Nielsen Feltzing ) -- Fixed a safe_mode bypass in tempnam() identified by Grzegorz Stachowiak. - (Rasmus) -- Fixed a open_basedir bypass in posix_mkfifo() identified by Grzegorz - Stachowiak. (Rasmus) -- Fixed crash in SQLiteDatabase::ArrayQuery() and SQLiteDatabase::SingleQuery() - when calling using Reflection. (Felipe) - Fixed crash when instantiating PDORow and PDOStatement through Reflection. (Felipe) - Fixed bug #49855 (import_request_variables() always returns NULL). (Ilia, sjoerd at php dot net) -- Fixed bug #49847 (exec() fails to return data inside 2nd parameter, given - output lines >4095 bytes). (Ilia) -- Fixed bug #49809 (time_sleep_until() is not available on OpenSolaris). (Jani) - Fixed bug #49800 (SimpleXML allow (un)serialize() calls without warning). (Ilia, wmeler at wp-sa dot pl) -- Fixed bug #49757 (long2ip() can return wrong value in a multi-threaded - applications). (Ilia, Florian Anderiasch) -- Fixed bug #49738 (calling mcrypt after mcrypt_generic_deinit crashes). - (Sriram Natarajan) -- Fixed bug #49732 (crashes when using fileinfo when timestamp conversion - fails). (Pierre) -- Fixed bug #49698 (Unexpected change in strnatcasecmp()). (Rasmus) - Fixed bug #49647 (DOMUserData does not exist). (Rob) -- Fixed bug #49630 (imap_listscan function missing). (Felipe) -- Fixed bug #49531 (CURLOPT_INFILESIZE sometimes causes warning "CURLPROTO_FILE - cannot be set"). (Felipe) -- Fixed bug #49517 (cURL's CURLOPT_FILE prevents file from being deleted after - fclose). (Ilia) - Fixed bug #49224 (Compile error due to old DNS functions on AIX systems). (Scott) -- Fixed bug #48805 (IPv6 socket transport is not working). (Ilia) -- Fixed PECL bug #16842 (oci_error return false when NO_DATA_FOUND is raised). - (Chris Jones) - -?? ??? 2009, PHP 5.3.1RC? -- Upgraded bundled sqlite to version 3.6.18. (Ilia) -- Restored shebang line check to CGI sapi (not checked by scanner anymore). - (Jani) - -- Fixed certificate validation inside php_openssl_apply_verification_policy - (Ryan Sleevi, Ilia) - -- Fixed bug #49572 (use of C++ style comments causes build failure). - (Sriram Natarajan) -- Fixed bug #49470 (FILTER_SANITIZE_EMAIL allows disallowed characters). - (Ilia) - - ?? ??? 2009, PHP 5.3.1 -- Upgraded bundled sqlite to version 3.6.17. (Scott) +# Will be merged in from branches/PHP_5_3_1 once released +# Pleas add stuff under 5.3.2 -- Added missing sanity checks around exif processing. (Ilia) -- Added error constant when json_encode() detects an invalid UTF-8 sequence. - (Scott) - -- Improved readlink on Windows, suppress \??\ and use the drive syntax only. - (Pierre) -- Improved dns_get_record() support on windows. Always available when - IPv6 is support is installed, format is now the same than on unix. (Pierre) -- Improved the DNS functions on OSX to use newer APIs, also use Bind 9 API - where available on other platforms. (Scott) -- Improved shared extension loading on OSX to use the standard Unix dlopen() - API. (Scott) - -- Fixed sanity check for the color index in imagecolortransparent. (Pierre) -- Fixed scandir/readdir when used mounted points on Windows. (Pierre) -- Fixed zlib.deflate compress filter to actually accept level parameter. (Jani) -- Fixed leak on error in popen/exec (and related functions) on Windows. - (Pierre) -- Fixed possible bad caching of symlinked directories in the realpath cache - on Windows. (Pierre) -- Fixed atime and mtime in stat related functions on Windows. (Pierre) -- Fixed spl_autoload_unregister/spl_autoload_functions wrt. Closures and - Functors. (Christian Seiler) -- Fixed open_basedir circumvention for "mail.log" ini directive. - (Maksymilian Arciemowicz, Stas) -- Fixed signature generation/validation for zip archives in ext/phar. (Greg) -- Fixed memory leak in stream_is_loca
[PHP-CVS] svn: /php/win-installer/trunk/ ExtensionsFeatures53.wxs ExtensionsFragment53.wxs
pajoye Mon, 19 Oct 2009 20:09:19 + Revision: http://svn.php.net/viewvc?view=revision&revision=289771 Log: - add glib and enchant backends to 5.3 Changed paths: U php/win-installer/trunk/ExtensionsFeatures53.wxs U php/win-installer/trunk/ExtensionsFragment53.wxs Modified: php/win-installer/trunk/ExtensionsFeatures53.wxs === --- php/win-installer/trunk/ExtensionsFeatures53.wxs2009-10-19 20:07:25 UTC (rev 289770) +++ php/win-installer/trunk/ExtensionsFeatures53.wxs2009-10-19 20:09:19 UTC (rev 289771) @@ -80,6 +80,10 @@ + + + + Modified: php/win-installer/trunk/ExtensionsFragment53.wxs === --- php/win-installer/trunk/ExtensionsFragment53.wxs2009-10-19 20:07:25 UTC (rev 289770) +++ php/win-installer/trunk/ExtensionsFragment53.wxs2009-10-19 20:09:19 UTC (rev 289771) @@ -20,6 +20,18 @@ + + + + + + + + + + + + -- 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/tests/001.phpt branches/PHP_5_3/ext/mysqli/tests/002.phpt branches/PHP_5_3/ext/mysqli/tests/003.phpt branches/PHP_5_3/ext/mysqli/tests/004.phpt
uw Mon, 19 Oct 2009 20:07:25 + Revision: http://svn.php.net/viewvc?view=revision&revision=289770 Log: Using require[_once] instead of include. Adding logic to connect.inc to detect multiple inclusions of connect.inc which leads to a Fatal error because of my_mysqli_connect() function redefinition. Some tests did include connect.inc twice -> run-tests - even the one from trunk - did not detect Fatal error in SKIPIF -> false-positive test result... Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqli/tests/001.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/002.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/003.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/004.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/005.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/006.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/007.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/008.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/009.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/010.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/011.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/012.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/013.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/014.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/015.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/016.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/017.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/018.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/019.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/020.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/021.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/022.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/023.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/024.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/025.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/026.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/027.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/028.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/029.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/030.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/031.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/032.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/033.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/034.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/035.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/036.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/037.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/038.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/039.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/040.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/041.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/042.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/043.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/044.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/045.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/046.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/047.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/048.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/049.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/050.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/051.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/052.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/053.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/054.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/055.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/056.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/057.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/058.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/059.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/060.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/061.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/062.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/063.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/064.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/065.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/066.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/067.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/069.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/070.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/071.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/072.phpt U php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/win32/build/ mkdist.php
pajoye Mon, 19 Oct 2009 20:02:05 + Revision: http://svn.php.net/viewvc?view=revision&revision=289769 Log: - Merge: we don't distribute the crt9 dll, don't try to add it Changed paths: U php/php-src/branches/PHP_5_3_1/win32/build/mkdist.php Modified: php/php-src/branches/PHP_5_3_1/win32/build/mkdist.php === --- php/php-src/branches/PHP_5_3_1/win32/build/mkdist.php 2009-10-19 19:58:45 UTC (rev 289768) +++ php/php-src/branches/PHP_5_3_1/win32/build/mkdist.php 2009-10-19 20:02:05 UTC (rev 289769) @@ -60,6 +60,7 @@ * but the debug version (msvcrtd.dll) and those from visual studio.net * (msvcrt7x.dll) are not */ 'msvcrt.dll', + 'msvcr90.dll', 'wldap32.dll' ); global $build_dir, $extra_dll_deps, $ext_targets, $sapi_targets, $pecl_targets, $phpdll, $per_module_deps, $pecl_dll_deps; -- 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/win32/build/mkdist.php trunk/win32/build/mkdist.php
pajoye Mon, 19 Oct 2009 19:58:45 + Revision: http://svn.php.net/viewvc?view=revision&revision=289768 Log: - we don't distribute the crt9 dll, don't try to add it Changed paths: U php/php-src/branches/PHP_5_3/win32/build/mkdist.php U php/php-src/trunk/win32/build/mkdist.php Modified: php/php-src/branches/PHP_5_3/win32/build/mkdist.php === --- php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2009-10-19 19:40:02 UTC (rev 289767) +++ php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2009-10-19 19:58:45 UTC (rev 289768) @@ -60,6 +60,7 @@ * but the debug version (msvcrtd.dll) and those from visual studio.net * (msvcrt7x.dll) are not */ 'msvcrt.dll', + 'msvcr90.dll', 'wldap32.dll' ); global $build_dir, $extra_dll_deps, $ext_targets, $sapi_targets, $pecl_targets, $phpdll, $per_module_deps, $pecl_dll_deps; Modified: php/php-src/trunk/win32/build/mkdist.php === --- php/php-src/trunk/win32/build/mkdist.php2009-10-19 19:40:02 UTC (rev 289767) +++ php/php-src/trunk/win32/build/mkdist.php2009-10-19 19:58:45 UTC (rev 289768) @@ -60,6 +60,7 @@ * but the debug version (msvcrtd.dll) and those from visual studio.net * (msvcrt7x.dll) are not */ 'msvcrt.dll', + 'msvcr90.dll', 'wldap32.dll' ); global $build_dir, $extra_dll_deps, $ext_targets, $sapi_targets, $pecl_targets, $phpdll, $per_module_deps, $pecl_dll_deps; -- 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/ tests/security/open_basedir_parse_ini_file.phpt win32/build/Makefile win32/build/config.w32 win32/build/mkdist.php
pajoye Mon, 19 Oct 2009 19:05:58 + Revision: http://svn.php.net/viewvc?view=revision&revision=289764 Log: - Merge: add custom DLL to the package and fix the path to the deps bin (needs absolute path in some cases) Changed paths: _U php/php-src/branches/PHP_5_3_1/ _U php/php-src/branches/PHP_5_3_1/ext/mysql/ _U php/php-src/branches/PHP_5_3_1/ext/mysqli/ _U php/php-src/branches/PHP_5_3_1/ext/mysqlnd/ _U php/php-src/branches/PHP_5_3_1/ext/pdo_mysql/ _U php/php-src/branches/PHP_5_3_1/ext/tidy/tests/ _U php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt U php/php-src/branches/PHP_5_3_1/win32/build/Makefile U php/php-src/branches/PHP_5_3_1/win32/build/config.w32 U php/php-src/branches/PHP_5_3_1/win32/build/mkdist.php Property changes on: php/php-src/branches/PHP_5_3_1 ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752 /php/php-src/trunk:284726 + /php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763 /php/php-src/trunk:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysql ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752 /php/php-src/trunk/ext/mysql:284726 + /php/php-src/branches/PHP_5_3/ext/mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763 /php/php-src/trunk/ext/mysql:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqli ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289612,289621-289624,289666,289690,289706,289752 /php/php-src/trunk/ext/mysqli:284726 + /php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763 /php/php-src/trunk/ext/mysqli:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqlnd ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/mysqlnd:288202-289561,289612,289621-289624,289666,289690,289706,289752 /php/php-src/trunk/ext/mysqlnd:284726 + /php/php-src/branches/PHP_5_3/ext/mysqlnd:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763 /php/php-src/trunk/ext/mysqlnd:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/pdo_mysql ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/pdo_mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752 /php/php-src/trunk/ext/pdo_mysql:284726 + /php/php-src/branches/PHP_5_3/ext/pdo_mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763 /php/php-src/trunk/ext/pdo_mysql:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/tidy/tests ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/tidy/tests:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 + /php/php-src/branches/PHP_5_3/ext/tidy/tests:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 Property changes on: php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 + /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 Modified: php/php-src/branches/PHP_5_3_1/win32/build/Makefile === --- php/php-src/branches/PHP_5_3_1/win32/build/Makefile 2009-10-19 19:02:12 UTC (rev 289763) +++ php/php-src/branches/PHP_5_3_1/win32/build/Makefile 2009-10-19 19:05:58 UTC (rev 289764) @@ -128,7 +128,7 @@ -del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip -del /f /q $(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip -del /f /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Wi
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/Makefile branches/PHP_5_3/win32/build/config.w32 branches/PHP_5_3/win32/build/mkdist.php trunk/win32/build/mkdist.php
pajoye Mon, 19 Oct 2009 19:02:12 +
Revision: http://svn.php.net/viewvc?view=revision&revision=289763
Log:
- add custom DLL to the package and fix the path to the deps bin (needs
absolute path in some cases)
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/Makefile
U php/php-src/branches/PHP_5_3/win32/build/config.w32
U php/php-src/branches/PHP_5_3/win32/build/mkdist.php
U php/php-src/trunk/win32/build/mkdist.php
Modified: php/php-src/branches/PHP_5_3/win32/build/Makefile
===
--- php/php-src/branches/PHP_5_3/win32/build/Makefile 2009-10-19 18:49:22 UTC
(rev 289762)
+++ php/php-src/branches/PHP_5_3/win32/build/Makefile 2009-10-19 19:02:12 UTC
(rev 289763)
@@ -128,7 +128,7 @@
-del /f /q
$(BUILD_DIR)\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
-del /f /q
$(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
-del /f /q
$(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
- $(BUILD_DIR)\php.exe -d date.timezone=UTC -n -dphar.readonly=0
win32/build/mkdist.php "$(BUILD_DIR)" "$(PHPDLL)" "$(SAPI_TARGETS)"
"$(EXT_TARGETS) $(PHP_EXTRA_DIST_FILES)" "$(PECL_TARGETS)
$(PECL_EXTRA_DIST_FILES)" "$(SNAPSHOT_TEMPLATE)"
+ $(BUILD_DIR)\php.exe -d date.timezone=UTC -n -dphar.readonly=0
win32/build/mkdist.php "$(BUILD_DIR)" "$(PHP_BUILD)" "$(PHPDLL)"
"$(SAPI_TARGETS)" "$(EXT_TARGETS) $(PHP_EXTRA_DIST_FILES)" "$(PECL_TARGETS)
$(PECL_EXTRA_DIST_FILES)" "$(SNAPSHOT_TEMPLATE)"
cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-$(ZIP) -9 -q -r
..\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
.
cd ..\..
Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32
===
--- php/php-src/branches/PHP_5_3/win32/build/config.w32 2009-10-19 18:49:22 UTC
(rev 289762)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2009-10-19 19:02:12 UTC
(rev 289763)
@@ -251,6 +251,7 @@
}
}
}
+ PHP_PHP_BUILD = FSO.GetAbsolutePathName(PHP_PHP_BUILD);
}
DEFINE("PHP_BUILD", PHP_PHP_BUILD);
Modified: php/php-src/branches/PHP_5_3/win32/build/mkdist.php
===
--- php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2009-10-19 18:49:22 UTC
(rev 289762)
+++ php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2009-10-19 19:02:12 UTC
(rev 289763)
@@ -2,11 +2,12 @@
/* piece together a windows binary distro */
$build_dir = $argv[1];
-$phpdll = $argv[2];
-$sapi_targets = explode(" ", $argv[3]);
-$ext_targets = explode(" ", $argv[4]);
-$pecl_targets = explode(" ", $argv[5]);
-$snapshot_template = $argv[6];
+$php_build_dir = $argv[2];
+$phpdll = $argv[3];
+$sapi_targets = explode(" ", $argv[4]);
+$ext_targets = explode(" ", $argv[5]);
+$pecl_targets = explode(" ", $argv[6]);
+$snapshot_template = $argv[7];
$is_debug = preg_match("/^debug/i", $build_dir);
@@ -295,7 +296,7 @@
/* try template dir */
$tdll = $snapshot_template . "/dlls/" . basename($dll);
if (!file_exists($tdll)) {
- $tdll = '../deps/bin/' . basename($dll);
+ $tdll = $php_build_dir . '/bin/' . basename($dll);
if (!file_exists($tdll)) {
echo "WARNING: distro depends on $dll, but
could not find it on your system\n";
continue;
@@ -309,11 +310,23 @@
/* TODO:
add sanity check and test if all required DLLs are present, per version
This version works at least for 3.6, 3.8 and 4.0 (5.3-vc6, 5.3-vc9 and HEAD).
+Add ADD_DLLS to add extra DLLs like dynamic dependencies for standard
+deps. For example, libenchant.dll loads libenchant_myspell.dll or
+libenchant_ispell.dll
*/
-$ICU_DLLS = '../deps/bin/' . 'icu*.dll';
+$ICU_DLLS = $php_build_dir . '/icu*.dll';
foreach (glob($ICU_DLLS) as $filename) {
copy($filename, "$dist_dir/" . basename($filename));
}
+$ENCHANT_DLLS = array(
+ 'glib-2.dll',
+ 'gmodule-2.dll',
+ 'libenchant_myspell.dll',
+ 'libenchant_ispell.dll',
+);
+foreach ($ENCHANT_DLLS as $filename) {
+ copy($php_build_dir . '/bin/' . $filename, "$dist_dir/" .
basename($filename));
+}
/* and those for pecl */
foreach ($pecl_dll_deps as $dll) {
@@ -332,6 +345,7 @@
}
copy($dll, "$pecl_dir/" . basename($dll));
}
+
function copy_dir($source, $dest)
{
if (!is_dir($dest)) {
@@ -365,7 +379,9 @@
}
if ($directory == 'tests') {
- mkdir($dest . '/tests', 0775, true);
+ if (!is_
[PHP-CVS] svn: /SVNROOT/ global_avail
derick Mon, 19 Oct 2009 18:35:19 + Revision: http://svn.php.net/viewvc?view=revision&revision=289761 Log: - Updating pear_avail per request from Hannes. Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2009-10-19 18:31:43 UTC (rev 289760) +++ SVNROOT/global_avail2009-10-19 18:35:19 UTC (rev 289761) @@ -11,7 +11,7 @@ # Some PEAR people get access to the pear-specific avail file in SVNROOT. -avail|davidc,jeichorn,cweiske,dufuz,ashnazg,jstump,tswicegood,saltybeagle,cellog|SVNROOT/pear_avail +avail|ashnazg,clockwerx,cweiske,gauthierm,kguest,saltybeagle,shupp|SVNROOT/pear_avail # The PHP Developers have full access to the full source trees for # PHP, as well as the documentation. -- 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/ ext/sqlite3/libsqlite/sqlite3.c ext/sqlite3/libsqlite/sqlite3.h tests/security/open_basedir_parse_ini_file.phpt
pajoye Mon, 19 Oct 2009 17:11:05 + Revision: http://svn.php.net/viewvc?view=revision&revision=289758 Log: - Merge: Update libsqlite to 3.6.19 Changed paths: _U php/php-src/branches/PHP_5_3_1/ _U php/php-src/branches/PHP_5_3_1/ext/mysql/ _U php/php-src/branches/PHP_5_3_1/ext/mysqli/ _U php/php-src/branches/PHP_5_3_1/ext/mysqlnd/ _U php/php-src/branches/PHP_5_3_1/ext/pdo_mysql/ U php/php-src/branches/PHP_5_3_1/ext/sqlite3/libsqlite/sqlite3.c U php/php-src/branches/PHP_5_3_1/ext/sqlite3/libsqlite/sqlite3.h _U php/php-src/branches/PHP_5_3_1/ext/tidy/tests/ _U php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt -- 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/ sapi/cgi/cgi_main.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Mon, 19 Oct 2009 17:04:44 +
Revision: http://svn.php.net/viewvc?view=revision&revision=289757
Log:
- Merge: improve fix for #49767 and #47627 - make PHP report 'no script' on 404
again
Bugs: http://bugs.php.net/49767 (Closed) estrdup crash
http://bugs.php.net/47627 (Bogus) "No input file specified" causing crash
Changed paths:
_U php/php-src/branches/PHP_5_3_1/
_U php/php-src/branches/PHP_5_3_1/ext/mysql/
_U php/php-src/branches/PHP_5_3_1/ext/mysqli/
_U php/php-src/branches/PHP_5_3_1/ext/mysqlnd/
_U php/php-src/branches/PHP_5_3_1/ext/pdo_mysql/
_U php/php-src/branches/PHP_5_3_1/ext/tidy/tests/
U php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c
_U
php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt
Property changes on: php/php-src/branches/PHP_5_3_1
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289752
/php/php-src/trunk:284726
+
/php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289706,289752
/php/php-src/trunk:284726
Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysql
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/mysql:288202-289561,289612,289621-289624,289666,289752
/php/php-src/trunk/ext/mysql:284726
+
/php/php-src/branches/PHP_5_3/ext/mysql:288202-289561,289612,289621-289624,289666,289706,289752
/php/php-src/trunk/ext/mysql:284726
Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqli
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289612,289621-289624,289666,289752
/php/php-src/trunk/ext/mysqli:284726
+
/php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289612,289621-289624,289666,289706,289752
/php/php-src/trunk/ext/mysqli:284726
Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqlnd
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/mysqlnd:288202-289561,289612,289621-289624,289666,289752
/php/php-src/trunk/ext/mysqlnd:284726
+
/php/php-src/branches/PHP_5_3/ext/mysqlnd:288202-289561,289612,289621-289624,289666,289706,289752
/php/php-src/trunk/ext/mysqlnd:284726
Property changes on: php/php-src/branches/PHP_5_3_1/ext/pdo_mysql
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/pdo_mysql:288202-289561,289612,289621-289624,289666,289752
/php/php-src/trunk/ext/pdo_mysql:284726
+
/php/php-src/branches/PHP_5_3/ext/pdo_mysql:288202-289561,289612,289621-289624,289666,289706,289752
/php/php-src/trunk/ext/pdo_mysql:284726
Property changes on: php/php-src/branches/PHP_5_3_1/ext/tidy/tests
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/tidy/tests:288351,289341,289612,289621-289624,289666-289667,289752
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:288351,289341,289612,289621-289624,289666-289667,289706,289752
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Modified: php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c
===
--- php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c 2009-10-19 16:59:40 UTC
(rev 289756)
+++ php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c 2009-10-19 17:04:44 UTC
(rev 289757)
@@ -2038,7 +2038,7 @@
1. we are running from shell and got filename
was there
2. we are running as cgi or fastcgi
*/
- if (cgi || SG(request_info).path_translated) {
+ if (cgi || fastcgi || SG(request_info).path_translated)
{
if (php_fopen_primary_script(&file_handle
TSRMLS_CC) == FAILURE) {
if (errno == EACCES) {
SG(sapi_headers).http_response_code = 403;
Property changes on:
php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:288351,289341,289612,289621-289624,289666-289667,289752
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:288351,289341,289612,289621-289624,289666-289667,289706,289752
/php/php-src/trunk/tests/security/open_basedir_parse_i
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/tests/mysqli_no_reconnect.phpt trunk/ext/mysqli/tests/mysqli_no_reconnect.phpt
uw Mon, 19 Oct 2009 16:07:10 +
Revision: http://svn.php.net/viewvc?view=revision&revision=289751
Log:
mysqlnd is a bit more verbose than libmysql - silence mysqlnd here for easier
comparison of test results.
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_no_reconnect.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_no_reconnect.phpt
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_no_reconnect.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_no_reconnect.phpt
2009-10-19 15:34:50 UTC (rev 289750)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_no_reconnect.phpt
2009-10-19 16:07:10 UTC (rev 289751)
@@ -78,8 +78,19 @@
mysqli_connect_errno(), mysqli_connect_error());
$thread_id_timeout = mysqli_thread_id($link);
- if (!mysqli_query($link, sprintf('KILL %d', $thread_id_timeout)))
- printf("[013] Cannot KILL timeout connection, [%d] %s\n",
mysqli_errno($link2), mysqli_error($link2));
+ if ($IS_MYSQLND) {
+ /*
+ mysqlnd is a bit more verbose than libmysql. mysqlnd should
print:
+ Warning: mysqli_query(): MySQL server has gone away in %s on
line %d
+
+ Warning: mysqli_query(): Error reading result set's header in
%d on line %d
+ */
+ if (!...@mysqli_query($link, sprintf('KILL %d',
$thread_id_timeout)))
+ printf("[013] Cannot KILL timeout connection, [%d]
%s\n", mysqli_errno($link2), mysqli_error($link2));
+ } else {
+ if (!mysqli_query($link, sprintf('KILL %d',
$thread_id_timeout)))
+ printf("[013] Cannot KILL timeout connection, [%d]
%s\n", mysqli_errno($link2), mysqli_error($link2));
+ }
// Give the server a second to really kill the other thread...
sleep(1);
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_no_reconnect.phpt
===
--- php/php-src/trunk/ext/mysqli/tests/mysqli_no_reconnect.phpt 2009-10-19
15:34:50 UTC (rev 289750)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_no_reconnect.phpt 2009-10-19
16:07:10 UTC (rev 289751)
@@ -78,8 +78,19 @@
mysqli_connect_errno(), mysqli_connect_error());
$thread_id_timeout = mysqli_thread_id($link);
- if (!mysqli_query($link, sprintf('KILL %d', $thread_id_timeout)))
- printf("[013] Cannot KILL timeout connection, [%d] %s\n",
mysqli_errno($link2), mysqli_error($link2));
+ if ($IS_MYSQLND) {
+ /*
+ mysqlnd is a bit more verbose than libmysql. mysqlnd should
print:
+ Warning: mysqli_query(): MySQL server has gone away in %s on
line %d
+
+ Warning: mysqli_query(): Error reading result set's header in
%d on line %d
+ */
+ if (!...@mysqli_query($link, sprintf('KILL %d',
$thread_id_timeout)))
+ printf("[013] Cannot KILL timeout connection, [%d]
%s\n", mysqli_errno($link2), mysqli_error($link2));
+ } else {
+ if (!mysqli_query($link, sprintf('KILL %d',
$thread_id_timeout)))
+ printf("[013] Cannot KILL timeout connection, [%d]
%s\n", mysqli_errno($link2), mysqli_error($link2));
+ }
// Give the server a second to really kill the other thread...
sleep(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/pdo_firebird/pdo_firebird.c branches/PHP_5_3/ext/phar/phar.c trunk/ext/exif/exif.c trunk/ext/phar/phar.c
jani Mon, 19 Oct 2009 15:34:50 +
Revision: http://svn.php.net/viewvc?view=revision&revision=289750
Log:
- It is not const in PHP_5_2 but it is in HEAD and PHP_5_3
Changed paths:
U php/php-src/branches/PHP_5_2/ext/pdo_firebird/pdo_firebird.c
U php/php-src/branches/PHP_5_3/ext/phar/phar.c
U php/php-src/trunk/ext/exif/exif.c
U php/php-src/trunk/ext/phar/phar.c
Modified: php/php-src/branches/PHP_5_2/ext/pdo_firebird/pdo_firebird.c
===
--- php/php-src/branches/PHP_5_2/ext/pdo_firebird/pdo_firebird.c
2009-10-19 13:50:17 UTC (rev 289749)
+++ php/php-src/branches/PHP_5_2/ext/pdo_firebird/pdo_firebird.c
2009-10-19 15:34:50 UTC (rev 289750)
@@ -38,7 +38,7 @@
/* {{{ pdo_firebird_deps
*/
#if ZEND_MODULE_API_NO >= 20050922
-static const zend_module_dep pdo_firebird_deps[] = {
+static zend_module_dep pdo_firebird_deps[] = {
ZEND_MOD_REQUIRED("pdo")
{NULL, NULL, NULL}
};
Modified: php/php-src/branches/PHP_5_3/ext/phar/phar.c
===
--- php/php-src/branches/PHP_5_3/ext/phar/phar.c2009-10-19 13:50:17 UTC
(rev 289749)
+++ php/php-src/branches/PHP_5_3/ext/phar/phar.c2009-10-19 15:34:50 UTC
(rev 289750)
@@ -3706,7 +3706,7 @@
/* {{{ phar_module_entry
*/
-static zend_module_dep phar_deps[] = {
+static const zend_module_dep phar_deps[] = {
ZEND_MOD_OPTIONAL("apc")
ZEND_MOD_OPTIONAL("bz2")
ZEND_MOD_OPTIONAL("openssl")
Modified: php/php-src/trunk/ext/exif/exif.c
===
--- php/php-src/trunk/ext/exif/exif.c 2009-10-19 13:50:17 UTC (rev 289749)
+++ php/php-src/trunk/ext/exif/exif.c 2009-10-19 15:34:50 UTC (rev 289750)
@@ -239,7 +239,7 @@
/* }}} */
/* {{{ exif dependencies */
-static zend_module_dep exif_module_deps[] = {
+static const zend_module_dep exif_module_deps[] = {
ZEND_MOD_REQUIRED("standard")
#if EXIF_USE_MBSTRING
ZEND_MOD_REQUIRED("mbstring")
Modified: php/php-src/trunk/ext/phar/phar.c
===
--- php/php-src/trunk/ext/phar/phar.c 2009-10-19 13:50:17 UTC (rev 289749)
+++ php/php-src/trunk/ext/phar/phar.c 2009-10-19 15:34:50 UTC (rev 289750)
@@ -3706,7 +3706,7 @@
/* {{{ phar_module_entry
*/
-static zend_module_dep phar_deps[] = {
+static const zend_module_dep phar_deps[] = {
ZEND_MOD_OPTIONAL("apc")
ZEND_MOD_OPTIONAL("bz2")
ZEND_MOD_OPTIONAL("openssl")
--
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/tests/mysqli_fetch_field_flags.phpt trunk/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
uw Mon, 19 Oct 2009 12:55:11 +
Revision: http://svn.php.net/viewvc?view=revision&revision=289746
Log:
MySQL server and metadata - a sad story... trying to make the test pass with a
few more server versions
Changed paths:
U
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
Modified:
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
2009-10-19 12:48:01 UTC (rev 289745)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
2009-10-19 12:55:11 UTC (rev 289746)
@@ -144,7 +144,7 @@
case 'TIMESTAMP NOT NULL':
// http://bugs.mysql.com/bug.php?id=30081 - new
flag introduced in 5.1.24/6.0.4
$version = mysqli_get_server_version($link);
- if ((($version > 50122) && ($version < 6))
||
+ if ((($version > 50122) && ($version < 6)
&& ($version != 50200)) ||
($version >= 60004)) {
// new flag ON_UPDATE_NOW_FLAG (8192)
$expected_flags .= ' ON_UPDATE_NOW';
@@ -165,7 +165,7 @@
case 'BIT':
$version = mysqli_get_server_version($link);
- if ($version <= 50105) {
+ if (($version <= 50114 && $version > 50100) ||
($version == 50200)) {
// TODO - check exact version!
$expected_flags =
trim(str_replace('UNSIGNED', '', $expected_flags));
}
@@ -176,8 +176,8 @@
list($missing_flags, $unexpected_flags, $flags_found) =
checkFlags($field->flags, $expected_flags, $flags);
if ($unexpected_flags) {
- printf("[006] Found unexpected flags '%s' for %s, found
'%s'\n",
- $unexpected_flags, $column_def, $flags_found);
+ printf("[006] Found unexpected flags '%s' for %s, found
'%s' with MySQL %s'\n",
+ $unexpected_flags, $column_def, $flags_found,
mysqli_get_server_version($link));
}
if ($missing_flags) {
printf("[007] The flags '%s' have not been reported for
%s, found '%s'\n",
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
===
--- php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
2009-10-19 12:48:01 UTC (rev 289745)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
2009-10-19 12:55:11 UTC (rev 289746)
@@ -144,7 +144,7 @@
case 'TIMESTAMP NOT NULL':
// http://bugs.mysql.com/bug.php?id=30081 - new
flag introduced in 5.1.24/6.0.4
$version = mysqli_get_server_version($link);
- if ((($version > 50122) && ($version < 6))
||
+ if ((($version > 50122) && ($version < 6)
&& ($version != 50200)) ||
($version >= 60004)) {
// new flag ON_UPDATE_NOW_FLAG (8192)
$expected_flags .= ' ON_UPDATE_NOW';
@@ -165,7 +165,7 @@
case 'BIT':
$version = mysqli_get_server_version($link);
- if ($version <= 50105) {
+ if (($version <= 50114 && $version > 50100) ||
($version == 50200)) {
// TODO - check exact version!
$expected_flags =
trim(str_replace('UNSIGNED', '', $expected_flags));
}
@@ -176,8 +176,8 @@
list($missing_flags, $unexpected_flags, $flags_found) =
checkFlags($field->flags, $expected_flags, $flags);
if ($unexpected_flags) {
- printf("[006] Found unexpected flags '%s' for %s, found
'%s'\n",
- $unexpected_flags, $column_def, $flags_found);
+ printf("[006] Found unexpected flags '%s' for %s, found
'%s' with MySQL %s'\n",
+ $unexpected_flags, $column_def, $flags_found,
mysqli_get_server_version($link));
}
if ($missing_flags) {
printf("[007] The flags '%s' have not been reported for
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS
jani Mon, 19 Oct 2009 12:42:10 + Revision: http://svn.php.net/viewvc?view=revision&revision=289743 Log: - It is close to next 5.2 release, ILIA! 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-10-19 12:37:17 UTC (rev 289742) +++ php/php-src/branches/PHP_5_2/NEWS 2009-10-19 12:42:10 UTC (rev 289743) @@ -1,7 +1,8 @@ PHPNEWS ||| -?? ??? 20??, PHP 5.2.12 -- Updated timezone database to version 2009.14 (2009n) (Derick) +?? ??? 2009, PHP 5.2.12 +- Updated timezone database to version 2009.14 (2009n). (Derick) + - Fixed a safe_mode bypass in tempnam() identified by Grzegorz Stachowiak. (Rasmus) - Fixed a open_basedir bypass in posix_mkfifo() identified by Grzegorz -- 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
jani Mon, 19 Oct 2009 12:37:17 + Revision: http://svn.php.net/viewvc?view=revision&revision=289742 Log: fn 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-10-19 12:09:48 UTC (rev 289741) +++ php/php-src/branches/PHP_5_3/NEWS 2009-10-19 12:37:17 UTC (rev 289742) @@ -2,8 +2,10 @@ ||| ?? ??? 20??, PHP 5.3.2 - Upgraded bundled sqlite to version 3.6.19. (Scott) -- Changed ini file directives [PATH=](on Win32) and [HOST=](on all) to be case - insensitive (Garretts) + +- Changed ini file directives [PATH=] (on Win32) and [HOST=] (on all OSes) to + be case insensitive. (Garretts) + - Added ReflectionMethod::setAccessible() for invoking non-public methods through the Reflection API. (Sebastian) -- 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/tests/mysqli_get_host_info.phpt branches/PHP_5_3/ext/mysqlnd/mysqlnd.c trunk/ext/mysqli/tests/mysqli_get_host_info.phpt trunk/ext/mysqlnd/mysql
uw Mon, 19 Oct 2009 12:09:48 +
Revision: http://svn.php.net/viewvc?view=revision&revision=289741
Log:
Fixing host info for TCP/IP and aligning mysqlnd and libmysql
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_get_host_info.phpt
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
U php/php-src/trunk/ext/mysqli/tests/mysqli_get_host_info.phpt
U php/php-src/trunk/ext/mysqlnd/mysqlnd.c
Modified:
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_get_host_info.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_get_host_info.phpt
2009-10-19 05:29:50 UTC (rev 289740)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_get_host_info.phpt
2009-10-19 12:09:48 UTC (rev 289741)
@@ -20,6 +20,11 @@
if (!is_string($info = mysqli_get_host_info($link)) || ('' === $info))
printf("[003] Expecting string/any_non_empty, got %s/%s\n",
gettype($info), $info);
+ if ($IS_MYSQLND && $host != 'localhost' && $host != '127.0.0.1' &&
$port != '' && $host != "" && strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
+ /* this should be a TCP/IP connection and not a Unix Socket (or
SHM or Named Pipe) */
+ if (!stristr($info, "TCP/IP"))
+ printf("[004] Should be a TCP/IP connection but mysqlnd
says '%s'\n", $info);
+ }
print "done!";
?>
--CLEAN--
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2009-10-19 05:29:50 UTC
(rev 289740)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2009-10-19 12:09:48 UTC
(rev 289741)
@@ -728,11 +728,12 @@
conn->user = pestrdup(user,
conn->persistent);
conn->passwd= pestrndup(passwd, passwd_len,
conn->persistent);
conn->port = port;
- if (host && !socket) {
+
+ if (!unix_socket) {
char *p;
conn->host = pestrdup(host, conn->persistent);
- spprintf(&p, 0, "MySQL host info: %s via TCP/IP",
conn->host);
+ spprintf(&p, 0, "%s via TCP/IP", conn->host);
if (conn->persistent) {
conn->host_info = pestrdup(p, 1);
mnd_efree(p);
@@ -741,7 +742,7 @@
}
} else {
conn->unix_socket = pestrdup(socket,
conn->persistent);
- conn->host_info = pestrdup("MySQL host info:
Localhost via UNIX socket", conn->persistent);
+ conn->host_info = pestrdup("Localhost via UNIX
socket", conn->persistent);
}
conn->client_flag = auth_packet->client_flags;
conn->max_packet_size = auth_packet->max_packet_size;
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_get_host_info.phpt
===
--- php/php-src/trunk/ext/mysqli/tests/mysqli_get_host_info.phpt
2009-10-19 05:29:50 UTC (rev 289740)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_get_host_info.phpt
2009-10-19 12:09:48 UTC (rev 289741)
@@ -20,6 +20,11 @@
if (!is_string($info = mysqli_get_host_info($link)) || ('' === $info))
printf("[003] Expecting string/any_non_empty, got %s/%s\n",
gettype($info), $info);
+ if ($IS_MYSQLND && $host != 'localhost' && $host != '127.0.0.1' &&
$port != '' && $host != "" && strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
+ /* this should be a TCP/IP connection and not a Unix Socket (or
SHM or Named Pipe) */
+ if (!stristr($info, "TCP/IP"))
+ printf("[004] Should be a TCP/IP connection but mysqlnd
says '%s'\n", $info);
+ }
print "done!";
?>
--CLEAN--
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2009-10-19 05:29:50 UTC (rev
289740)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2009-10-19 12:09:48 UTC (rev
289741)
@@ -728,11 +728,12 @@
conn->user = pestrdup(user,
conn->persistent);
conn->passwd= pestrndup(passwd, passwd_len,
conn->persistent);
conn->port = port;
- if (host && !socket) {
+
+ if (!unix_socket) {
char *p;
conn->host = pestrdup(host, conn->persistent);
- spprintf(&p, 0, "MySQL host info: %s
