[PHP-CVS] cvs: php-src /main main.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 12:01:14 2006 UTC

  Modified files:  
/php-src/main   main.c 
  Log:
  use strlcat() and a bigger buffer
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.716&r2=1.717&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.716 php-src/main/main.c:1.717
--- php-src/main/main.c:1.716   Tue Dec 26 17:40:20 2006
+++ php-src/main/main.c Thu Dec 28 12:01:14 2006
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.716 2006/12/26 17:40:20 iliaa Exp $ */
+/* $Id: main.c,v 1.717 2006/12/28 12:01:14 tony2001 Exp $ */
 
 /* {{{ includes
  */
@@ -1070,7 +1070,7 @@
case ZMSG_MEMORY_LEAK_REPEATED:
 #if ZEND_DEBUG
if (EG(error_reporting) & E_WARNING) {
-   char memory_leak_buf[512];
+   char memory_leak_buf[1024];
 
if (message==ZMSG_MEMORY_LEAK_DETECTED) {
zend_leak_info *t = (zend_leak_info *) 
data;
@@ -1080,7 +1080,7 @@
char relay_buf[512];
 
snprintf(relay_buf, 512, 
"%s(%d) : Actual location (location was relayed)\n", t->orig_filename, 
t->orig_lineno);
-   strcat(memory_leak_buf, 
relay_buf);
+   strlcat(memory_leak_buf, 
relay_buf, sizeof(memory_leak_buf));
}
} else {
unsigned long leak_count = (unsigned 
long) data;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /main main.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 12:01:50 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   main.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.26&r2=1.640.2.23.2.27&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.26 php-src/main/main.c:1.640.2.23.2.27
--- php-src/main/main.c:1.640.2.23.2.26 Mon Dec 25 23:55:59 2006
+++ php-src/main/main.c Thu Dec 28 12:01:50 2006
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.640.2.23.2.26 2006/12/25 23:55:59 iliaa Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.27 2006/12/28 12:01:50 tony2001 Exp $ */
 
 /* {{{ includes
  */
@@ -961,7 +961,7 @@
case ZMSG_MEMORY_LEAK_REPEATED:
 #if ZEND_DEBUG
if (EG(error_reporting) & E_WARNING) {
-   char memory_leak_buf[512];
+   char memory_leak_buf[1024];
 
if (message==ZMSG_MEMORY_LEAK_DETECTED) {
zend_leak_info *t = (zend_leak_info *) 
data;
@@ -971,7 +971,7 @@
char relay_buf[512];
 
snprintf(relay_buf, 512, 
"%s(%d) : Actual location (location was relayed)\n", t->orig_filename, 
t->orig_lineno);
-   strcat(memory_leak_buf, 
relay_buf);
+   strlcat(memory_leak_buf, 
relay_buf, sizeof(memory_leak_buf));
}
} else {
unsigned long leak_count = (unsigned 
long) data;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_4) /main main.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 12:03:00 2006 UTC

  Modified files:  (Branch: PHP_4_4)
/php-src/main   main.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.512.2.63.2.12&r2=1.512.2.63.2.13&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.512.2.63.2.12 php-src/main/main.c:1.512.2.63.2.13
--- php-src/main/main.c:1.512.2.63.2.12 Tue Dec 26 17:33:12 2006
+++ php-src/main/main.c Thu Dec 28 12:02:59 2006
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.512.2.63.2.12 2006/12/26 17:33:12 iliaa Exp $ */
+/* $Id: main.c,v 1.512.2.63.2.13 2006/12/28 12:02:59 tony2001 Exp $ */
 
 /* {{{ includes
  */
@@ -824,7 +824,7 @@
 
if ((EG(error_reporting)&E_WARNING) && 
PG(report_memleaks)) {
 #if ZEND_DEBUG
-   char memory_leak_buf[512];
+   char memory_leak_buf[1024];
 
if (message==ZMSG_MEMORY_LEAK_DETECTED) 
{
zend_mem_header *t = 
(zend_mem_header *) data;
@@ -835,7 +835,7 @@
char relay_buf[512];
 
snprintf(relay_buf, 
512, "%s(%d) : Actual location (location was relayed)\n", t->orig_filename, 
t->orig_lineno);
-   strcat(memory_leak_buf, 
relay_buf);
+   
strlcat(memory_leak_buf, relay_buf, sizeof(memory_leak_buf));
}
} else {
unsigned long leak_count = 
(unsigned long) data;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php_ini.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 12:18:47 2006 UTC

  Modified files:  
/php-src/main   php_ini.c 
  Log:
  use strlcat()
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.145&r2=1.146&diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.145 php-src/main/php_ini.c:1.146
--- php-src/main/php_ini.c:1.145Tue Sep  5 11:55:08 2006
+++ php-src/main/php_ini.c  Thu Dec 28 12:18:47 2006
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_ini.c,v 1.145 2006/09/05 11:55:08 edink Exp $ */
+/* $Id: php_ini.c,v 1.146 2006/12/28 12:18:47 tony2001 Exp $ */
 
 #include "php.h"
 #include "ext/standard/info.h"
@@ -289,6 +289,7 @@
php_ini_search_path = sapi_module.php_ini_path_override;
free_ini_search_path = 0;
} else if (!sapi_module.php_ini_ignore) {
+   int search_path_size;
char *default_location;
char *env_location;
char *binary_location;
@@ -306,16 +307,17 @@
 * Prepare search path
 */
 
-   php_ini_search_path = (char *) emalloc(MAXPATHLEN * 4 + 
strlen(env_location) + 3 + 1);
+   search_path_size = MAXPATHLEN * 4 + strlen(env_location) + 3 + 
1;
+   php_ini_search_path = (char *) emalloc(search_path_size);
free_ini_search_path = 1;
php_ini_search_path[0] = 0;
 
/* Add environment location */
if (env_location[0]) {
if (*php_ini_search_path) {
-   strcat(php_ini_search_path, paths_separator);
+   strlcat(php_ini_search_path, paths_separator, 
search_path_size);
}
-   strcat(php_ini_search_path, env_location);
+   strlcat(php_ini_search_path, env_location, 
search_path_size);
php_ini_file_name = env_location;
}
 
@@ -324,9 +326,9 @@
reg_location = GetIniPathFromRegistry();
if (reg_location != NULL) {
if (*php_ini_search_path) {
-   strcat(php_ini_search_path, paths_separator);
+   strlcat(php_ini_search_path, paths_separator, 
search_path_size);
}
-   strcat(php_ini_search_path, reg_location);
+   strlcat(php_ini_search_path, reg_location, 
search_path_size);
efree(reg_location);
}
 #endif
@@ -334,9 +336,9 @@
/* Add cwd (not with CLI) */
if (strcmp(sapi_module.name, "cli") != 0) {
if (*php_ini_search_path) {
-   strcat(php_ini_search_path, paths_separator);
+   strlcat(php_ini_search_path, paths_separator, 
search_path_size);
}
-   strcat(php_ini_search_path, ".");
+   strlcat(php_ini_search_path, ".", search_path_size);
}
 
/* Add binary directory */
@@ -364,9 +366,9 @@
*(separator_location) = 0;
}
if (*php_ini_search_path) {
-   strcat(php_ini_search_path, paths_separator);
+   strlcat(php_ini_search_path, paths_separator, 
search_path_size);
}
-   strcat(php_ini_search_path, binary_location);
+   strlcat(php_ini_search_path, binary_location, 
search_path_size);
efree(binary_location);
}
 
@@ -376,9 +378,9 @@

if (0 < GetWindowsDirectory(default_location, MAXPATHLEN)) {
if (*php_ini_search_path) {
-   strcat(php_ini_search_path, paths_separator);
+   strlcat(php_ini_search_path, paths_separator, 
search_path_size);
}
-   strcat(php_ini_search_path, default_location);
+   strlcat(php_ini_search_path, default_location, 
search_path_size);
}
efree(default_location);
 
@@ -400,9 +402,9 @@
default_location = (char *) emalloc(MAXPATHLEN 
+ 1);
if (0 < 
get_system_windows_directory(default_location, MAXPATHLEN)) {
if (*php_ini_search_path) {
-   strcat(php_ini_search_path, 
paths_separator);
+   strlcat(php_ini_search_path, 
paths_separator, search_path_size);
}
-   strcat(p

[PHP-CVS] cvs: php-src(PHP_5_2) /main php_ini.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 12:18:54 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   php_ini.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.136.2.4.2.4&r2=1.136.2.4.2.5&diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.136.2.4.2.4 
php-src/main/php_ini.c:1.136.2.4.2.5
--- php-src/main/php_ini.c:1.136.2.4.2.4Tue Sep 19 20:33:11 2006
+++ php-src/main/php_ini.c  Thu Dec 28 12:18:54 2006
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_ini.c,v 1.136.2.4.2.4 2006/09/19 20:33:11 dmitry Exp $ */
+/* $Id: php_ini.c,v 1.136.2.4.2.5 2006/12/28 12:18:54 tony2001 Exp $ */
 
 #include "php.h"
 #include "ext/standard/info.h"
@@ -291,6 +291,7 @@
php_ini_search_path = sapi_module.php_ini_path_override;
free_ini_search_path = 0;
} else if (!sapi_module.php_ini_ignore) {
+   int search_path_size;
char *default_location;
char *env_location;
char *binary_location;
@@ -308,16 +309,17 @@
 * Prepare search path
 */
 
-   php_ini_search_path = (char *) emalloc(MAXPATHLEN * 4 + 
strlen(env_location) + 3 + 1);
+   search_path_size = MAXPATHLEN * 4 + strlen(env_location) + 3 + 
1;
+   php_ini_search_path = (char *) emalloc(search_path_size);
free_ini_search_path = 1;
php_ini_search_path[0] = 0;
 
/* Add environment location */
if (env_location[0]) {
if (*php_ini_search_path) {
-   strcat(php_ini_search_path, paths_separator);
+   strlcat(php_ini_search_path, paths_separator, 
search_path_size);
}
-   strcat(php_ini_search_path, env_location);
+   strlcat(php_ini_search_path, env_location, 
search_path_size);
php_ini_file_name = env_location;
}
 
@@ -326,9 +328,9 @@
reg_location = GetIniPathFromRegistry();
if (reg_location != NULL) {
if (*php_ini_search_path) {
-   strcat(php_ini_search_path, paths_separator);
+   strlcat(php_ini_search_path, paths_separator, 
search_path_size);
}
-   strcat(php_ini_search_path, reg_location);
+   strlcat(php_ini_search_path, reg_location, 
search_path_size);
efree(reg_location);
}
 #endif
@@ -336,9 +338,9 @@
/* Add cwd (not with CLI) */
if (strcmp(sapi_module.name, "cli") != 0) {
if (*php_ini_search_path) {
-   strcat(php_ini_search_path, paths_separator);
+   strlcat(php_ini_search_path, paths_separator, 
search_path_size);
}
-   strcat(php_ini_search_path, ".");
+   strlcat(php_ini_search_path, ".", search_path_size);
}
 
/* Add binary directory */
@@ -366,9 +368,9 @@
*(separator_location) = 0;
}
if (*php_ini_search_path) {
-   strcat(php_ini_search_path, paths_separator);
+   strlcat(php_ini_search_path, paths_separator, 
search_path_size);
}
-   strcat(php_ini_search_path, binary_location);
+   strlcat(php_ini_search_path, binary_location, 
search_path_size);
efree(binary_location);
}
 
@@ -378,9 +380,9 @@

if (0 < GetWindowsDirectory(default_location, MAXPATHLEN)) {
if (*php_ini_search_path) {
-   strcat(php_ini_search_path, paths_separator);
+   strlcat(php_ini_search_path, paths_separator, 
search_path_size);
}
-   strcat(php_ini_search_path, default_location);
+   strlcat(php_ini_search_path, default_location, 
search_path_size);
}
efree(default_location);
 
@@ -402,9 +404,9 @@
default_location = (char *) emalloc(MAXPATHLEN 
+ 1);
if (0 < 
get_system_windows_directory(default_location, MAXPATHLEN)) {
if (*php_ini_search_path) {
-   strcat(php_ini_search_path, 
paths_separator);
+   strlcat(php_ini_search_path, 
paths_separator, search_path_size);

[PHP-CVS] cvs: php-src(PHP_4_4) /main php_ini.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 12:19:21 2006 UTC

  Modified files:  (Branch: PHP_4_4)
/php-src/main   php_ini.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.106.2.15.2.2&r2=1.106.2.15.2.3&diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.106.2.15.2.2 
php-src/main/php_ini.c:1.106.2.15.2.3
--- php-src/main/php_ini.c:1.106.2.15.2.2   Sun Jan  1 13:46:59 2006
+++ php-src/main/php_ini.c  Thu Dec 28 12:19:21 2006
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_ini.c,v 1.106.2.15.2.2 2006/01/01 13:46:59 sniper Exp $ */
+/* $Id: php_ini.c,v 1.106.2.15.2.3 2006/12/28 12:19:21 tony2001 Exp $ */
 
 /* Check CWD for php.ini */
 #define INI_CHECK_CWD
@@ -280,10 +280,12 @@
php_ini_search_path = sapi_module.php_ini_path_override;
free_ini_search_path = 0;
} else {
+   int search_path_size;
char *default_location;
static const char paths_separator[] = { ZEND_PATHS_SEPARATOR, 0 
};
 
-   php_ini_search_path = (char *) emalloc(MAXPATHLEN * 
NUM_INI_SEARCH_LOCATIONS + strlen(env_location) + NUM_INI_SEARCH_LOCATIONS + 1);
+   search_path_size = MAXPATHLEN * NUM_INI_SEARCH_LOCATIONS + 
strlen(env_location) + NUM_INI_SEARCH_LOCATIONS + 1;
+   php_ini_search_path = (char *) emalloc(search_path_size);
free_ini_search_path = 1;
php_ini_search_path[0] = 0;
 
@@ -294,18 +296,18 @@
/* Add environment location */
if (env_location[0]) {
if (*php_ini_search_path) {
-   strcat(php_ini_search_path, paths_separator);
+   strlcat(php_ini_search_path, paths_separator, 
search_path_size);
}
-   strcat(php_ini_search_path, env_location);
+   strlcat(php_ini_search_path, env_location, 
search_path_size);
}
 
 #ifdef PHP_WIN32
registry_location = GetIniPathFromRegistry();
if (registry_location) {
if (*php_ini_search_path) {
-   strcat(php_ini_search_path, paths_separator);
+   strlcat(php_ini_search_path, paths_separator, 
search_path_size);
}
-   strcat(php_ini_search_path, registry_location);
+   strlcat(php_ini_search_path, registry_location, 
search_path_size);
efree(registry_location);
}
 #endif
@@ -314,9 +316,9 @@
 #ifdef INI_CHECK_CWD
if (strcmp(sapi_module.name, "cli") != 0) {
if (*php_ini_search_path) {
-   strcat(php_ini_search_path, paths_separator);
+   strlcat(php_ini_search_path, paths_separator, 
search_path_size);
}
-   strcat(php_ini_search_path, ".");
+   strlcat(php_ini_search_path, ".", search_path_size);
}
 #endif
 
@@ -341,9 +343,9 @@
*(separator_location+1) = 0;
}
if (*php_ini_search_path) {
-   strcat(php_ini_search_path, paths_separator);
+   strlcat(php_ini_search_path, paths_separator, 
search_path_size);
}
-   strcat(php_ini_search_path, binary_location);
+   strlcat(php_ini_search_path, binary_location, 
search_path_size);
efree(binary_location);
}
 
@@ -353,17 +355,17 @@

if (0 < GetWindowsDirectory(default_location, MAXPATHLEN)) {
if (*php_ini_search_path) {
-   strcat(php_ini_search_path, paths_separator);
+   strlcat(php_ini_search_path, paths_separator, 
search_path_size);
}
-   strcat(php_ini_search_path, default_location);
+   strlcat(php_ini_search_path, default_location, 
search_path_size);
}
efree(default_location);
 #else
default_location = PHP_CONFIG_FILE_PATH;
if (*php_ini_search_path) {
-   strcat(php_ini_search_path, paths_separator);
+   strlcat(php_ini_search_path, paths_separator, 
search_path_size);
}
-   strcat(php_ini_search_path, default_location);
+   strlcat(php_ini_search_path, default_location, 
search_path_size);
 #endif
}
 
@@ -468,8 +470,8 @@
php_ini_scanned_files = (char *) 
malloc(total_l);
*php

[PHP-CVS] cvs: php-src /sapi/apache php_apache.c /sapi/apache_hooks php_apache.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 13:30:18 2006 UTC

  Modified files:  
/php-src/sapi/apachephp_apache.c 
/php-src/sapi/apache_hooks  php_apache.c 
  Log:
  use strlcat()
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/php_apache.c?r1=1.98&r2=1.99&diff_format=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.98 
php-src/sapi/apache/php_apache.c:1.99
--- php-src/sapi/apache/php_apache.c:1.98   Wed Sep 27 18:18:59 2006
+++ php-src/sapi/apache/php_apache.cThu Dec 28 13:30:18 2006
@@ -17,7 +17,7 @@
|  David Sklar <[EMAIL PROTECTED]> |
+--+
  */
-/* $Id: php_apache.c,v 1.98 2006/09/27 18:18:59 derick Exp $ */
+/* $Id: php_apache.c,v 1.99 2006/12/28 13:30:18 tony2001 Exp $ */
 
 #include "php_apache_http.h"
 
@@ -235,9 +235,9 @@
if ((p = strrchr(name, '.'))) {
*p='\0'; /* Cut off ugly .c extensions on module names 
*/
}
-   strcat(modulenames, name);
+   strlcat(modulenames, name, sizeof(modulenames));
if (modp->next) {
-   strcat(modulenames, ", ");
+   strlcat(modulenames, ", ", sizeof(modulenames));
}
}
php_info_print_table_row(2, "Loaded Modules", modulenames);
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.26&r2=1.27&diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.26 
php-src/sapi/apache_hooks/php_apache.c:1.27
--- php-src/sapi/apache_hooks/php_apache.c:1.26 Wed Sep  6 11:55:12 2006
+++ php-src/sapi/apache_hooks/php_apache.c  Thu Dec 28 13:30:18 2006
@@ -17,7 +17,7 @@
|  David Sklar <[EMAIL PROTECTED]> |
+--+
  */
-/* $Id: php_apache.c,v 1.26 2006/09/06 11:55:12 nlopess Exp $ */
+/* $Id: php_apache.c,v 1.27 2006/12/28 13:30:18 tony2001 Exp $ */
 
 #include "php_apache_http.h"
 
@@ -1637,9 +1637,9 @@
if ((p = strrchr(name, '.'))) {
*p='\0'; /* Cut off ugly .c extensions on module names 
*/
}
-   strcat(modulenames, name);
+   strlcat(modulenames, name, sizeof(modulenames));
if (modp->next) {
-   strcat(modulenames, ", ");
+   strlcat(modulenames, ", ", sizeof(modulenames));
}
}
php_info_print_table_row(2, "Loaded Modules", modulenames);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_4) /sapi/apache php_apache.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 13:30:34 2006 UTC

  Modified files:  (Branch: PHP_4_4)
/php-src/sapi/apachephp_apache.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/php_apache.c?r1=1.69.2.5.4.1&r2=1.69.2.5.4.2&diff_format=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.69.2.5.4.1 
php-src/sapi/apache/php_apache.c:1.69.2.5.4.2
--- php-src/sapi/apache/php_apache.c:1.69.2.5.4.1   Sun Jan  1 13:47:01 2006
+++ php-src/sapi/apache/php_apache.cThu Dec 28 13:30:34 2006
@@ -17,7 +17,7 @@
|  David Sklar <[EMAIL PROTECTED]> |
+--+
  */
-/* $Id: php_apache.c,v 1.69.2.5.4.1 2006/01/01 13:47:01 sniper Exp $ */
+/* $Id: php_apache.c,v 1.69.2.5.4.2 2006/12/28 13:30:34 tony2001 Exp $ */
 
 #include "php_apache_http.h"
 
@@ -224,9 +224,9 @@
if ((p = strrchr(name, '.'))) {
*p='\0'; /* Cut off ugly .c extensions on module names 
*/
}
-   strcat(modulenames, name);
+   strlcat(modulenames, name, sizeof(modulenames));
if (modp->next) {
-   strcat(modulenames, ", ");
+   strlcat(modulenames, ", ", sizeof(modulenames));
}
}
php_info_print_table_row(2, "Loaded Modules", modulenames);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/apache php_apache.c /sapi/apache_hooks php_apache.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 13:30:25 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/sapi/apachephp_apache.c 
/php-src/sapi/apache_hooks  php_apache.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/php_apache.c?r1=1.89.2.4.2.1&r2=1.89.2.4.2.2&diff_format=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.89.2.4.2.1 
php-src/sapi/apache/php_apache.c:1.89.2.4.2.2
--- php-src/sapi/apache/php_apache.c:1.89.2.4.2.1   Wed Sep  6 11:54:28 2006
+++ php-src/sapi/apache/php_apache.cThu Dec 28 13:30:25 2006
@@ -17,7 +17,7 @@
|  David Sklar <[EMAIL PROTECTED]> |
+--+
  */
-/* $Id: php_apache.c,v 1.89.2.4.2.1 2006/09/06 11:54:28 nlopess Exp $ */
+/* $Id: php_apache.c,v 1.89.2.4.2.2 2006/12/28 13:30:25 tony2001 Exp $ */
 
 #include "php_apache_http.h"
 
@@ -235,9 +235,9 @@
if ((p = strrchr(name, '.'))) {
*p='\0'; /* Cut off ugly .c extensions on module names 
*/
}
-   strcat(modulenames, name);
+   strlcat(modulenames, name, sizeof(modulenames));
if (modp->next) {
-   strcat(modulenames, ", ");
+   strlcat(modulenames, ", ", sizeof(modulenames));
}
}
php_info_print_table_row(2, "Loaded Modules", modulenames);
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.19.2.3.2.1&r2=1.19.2.3.2.2&diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.1 
php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.2
--- php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.1 Wed Sep  6 11:54:29 2006
+++ php-src/sapi/apache_hooks/php_apache.c  Thu Dec 28 13:30:25 2006
@@ -17,7 +17,7 @@
|  David Sklar <[EMAIL PROTECTED]> |
+--+
  */
-/* $Id: php_apache.c,v 1.19.2.3.2.1 2006/09/06 11:54:29 nlopess Exp $ */
+/* $Id: php_apache.c,v 1.19.2.3.2.2 2006/12/28 13:30:25 tony2001 Exp $ */
 
 #include "php_apache_http.h"
 
@@ -1637,9 +1637,9 @@
if ((p = strrchr(name, '.'))) {
*p='\0'; /* Cut off ugly .c extensions on module names 
*/
}
-   strcat(modulenames, name);
+   strlcat(modulenames, name, sizeof(modulenames));
if (modp->next) {
-   strcat(modulenames, ", ");
+   strlcat(modulenames, ", ", sizeof(modulenames));
}
}
php_info_print_table_row(2, "Loaded Modules", modulenames);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/sockets sockets.c /ext/standard reg.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 14:17:09 2006 UTC

  Modified files:  
/php-src/ext/socketssockets.c 
/php-src/ext/standard   reg.c 
  Log:
  minor improvements
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.185&r2=1.186&diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.185 php-src/ext/sockets/sockets.c:1.186
--- php-src/ext/sockets/sockets.c:1.185 Mon Dec 25 19:34:00 2006
+++ php-src/ext/sockets/sockets.c   Thu Dec 28 14:17:09 2006
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.185 2006/12/25 19:34:00 tony2001 Exp $ */
+/* $Id: sockets.c,v 1.186 2006/12/28 14:17:09 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1627,11 +1627,12 @@
 {
zval*arg1, **arg4;
struct linger   lv;
-   struct timeval tv;
php_socket  *php_sock;
int ov, optlen, retval; 
 #ifdef PHP_WIN32
int timeout;
+#else 
+   struct timeval tv;
 #endif
longlevel, optname;
void*opt_ptr;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/reg.c?r1=1.84&r2=1.85&diff_format=u
Index: php-src/ext/standard/reg.c
diff -u php-src/ext/standard/reg.c:1.84 php-src/ext/standard/reg.c:1.85
--- php-src/ext/standard/reg.c:1.84 Sun Jan  1 13:09:55 2006
+++ php-src/ext/standard/reg.c  Thu Dec 28 14:17:09 2006
@@ -17,7 +17,7 @@
|  Jaakko Hyvätti <[EMAIL PROTECTED]>  | 
+--+
  */
-/* $Id: reg.c,v 1.84 2006/01/01 13:09:55 sniper Exp $ */
+/* $Id: reg.c,v 1.85 2006/12/28 14:17:09 tony2001 Exp $ */
 
 #include 
 #include 
@@ -425,7 +425,7 @@
buf = nbuf;
}
/* stick that last bit of string on our output */
-   strcat(buf, &string[pos]);
+   strlcat(buf, &string[pos], buf_len);
}
}
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/sockets sockets.c /ext/standard reg.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 14:17:39 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   reg.c 
/php-src/ext/socketssockets.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/reg.c?r1=1.82.2.3&r2=1.82.2.3.2.1&diff_format=u
Index: php-src/ext/standard/reg.c
diff -u php-src/ext/standard/reg.c:1.82.2.3 
php-src/ext/standard/reg.c:1.82.2.3.2.1
--- php-src/ext/standard/reg.c:1.82.2.3 Sun Feb 26 10:49:50 2006
+++ php-src/ext/standard/reg.c  Thu Dec 28 14:17:38 2006
@@ -17,7 +17,7 @@
|  Jaakko Hyvätti <[EMAIL PROTECTED]>  | 
+--+
  */
-/* $Id: reg.c,v 1.82.2.3 2006/02/26 10:49:50 helly Exp $ */
+/* $Id: reg.c,v 1.82.2.3.2.1 2006/12/28 14:17:38 tony2001 Exp $ */
 
 #include 
 #include 
@@ -425,7 +425,7 @@
buf = nbuf;
}
/* stick that last bit of string on our output */
-   strcat(buf, &string[pos]);
+   strlcat(buf, &string[pos], buf_len);
}
}
 
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.171.2.9.2.4&r2=1.171.2.9.2.5&diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.4 
php-src/ext/sockets/sockets.c:1.171.2.9.2.5
--- php-src/ext/sockets/sockets.c:1.171.2.9.2.4 Tue Oct  3 19:51:01 2006
+++ php-src/ext/sockets/sockets.c   Thu Dec 28 14:17:38 2006
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.171.2.9.2.4 2006/10/03 19:51:01 iliaa Exp $ */
+/* $Id: sockets.c,v 1.171.2.9.2.5 2006/12/28 14:17:38 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1600,11 +1600,12 @@
 {
zval*arg1, **arg4;
struct linger   lv;
-   struct timeval tv;
php_socket  *php_sock;
int ov, optlen, retval; 
 #ifdef PHP_WIN32
int timeout;
+#else 
+   struct timeval tv;
 #endif
longlevel, optname;
void*opt_ptr;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 14:26:30 2006 UTC

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  use strlcat()
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.196&r2=1.197&diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.196 php-src/ext/odbc/php_odbc.c:1.197
--- php-src/ext/odbc/php_odbc.c:1.196   Wed Jun 14 05:51:16 2006
+++ php-src/ext/odbc/php_odbc.c Thu Dec 28 14:26:30 2006
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.196 2006/06/14 05:51:16 dmitry Exp $ */
+/* $Id: php_odbc.c,v 1.197 2006/12/28 14:26:30 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2083,23 +2083,23 @@
 if (strstr(db, "pwd") || strstr(db, "PWD")) {
 pwd = NULL;
 }
-strncpy( lpszConnStr, db, CONNSTRSIZE);
+strlcpy( lpszConnStr, db, CONNSTRSIZE);
 }
 else {
 strcpy(lpszConnStr, "DSN=");
-strcat(lpszConnStr, db);
+strlcat(lpszConnStr, db, CONNSTRSIZE);
 }
 if (uid) {
 if (uid[0]) {
-strcat(lpszConnStr, ";UID=");
-strcat(lpszConnStr, uid);
-strcat(lpszConnStr, ";");
+strlcat(lpszConnStr, ";UID=", CONNSTRSIZE);
+strlcat(lpszConnStr, uid, CONNSTRSIZE);
+strlcat(lpszConnStr, ";", CONNSTRSIZE);
 }
 if (pwd) {
 if (pwd[0]) {
-strcat(lpszConnStr, "PWD=");
-strcat(lpszConnStr, pwd);
-strcat(lpszConnStr, ";");
+strlcat(lpszConnStr, "PWD=", 
CONNSTRSIZE);
+strlcat(lpszConnStr, pwd, CONNSTRSIZE);
+strlcat(lpszConnStr, ";", CONNSTRSIZE);
 }
 }
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/odbc php_odbc.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 14:26:37 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/odbc   php_odbc.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.189.2.4.2.1&r2=1.189.2.4.2.2&diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.189.2.4.2.1 
php-src/ext/odbc/php_odbc.c:1.189.2.4.2.2
--- php-src/ext/odbc/php_odbc.c:1.189.2.4.2.1   Thu Jun 15 18:33:08 2006
+++ php-src/ext/odbc/php_odbc.c Thu Dec 28 14:26:36 2006
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.189.2.4.2.1 2006/06/15 18:33:08 dmitry Exp $ */
+/* $Id: php_odbc.c,v 1.189.2.4.2.2 2006/12/28 14:26:36 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2090,23 +2090,23 @@
 if (strstr(db, "pwd") || strstr(db, "PWD")) {
 pwd = NULL;
 }
-strncpy( lpszConnStr, db, CONNSTRSIZE);
+strlcpy( lpszConnStr, db, CONNSTRSIZE);
 }
 else {
 strcpy(lpszConnStr, "DSN=");
-strcat(lpszConnStr, db);
+strlcat(lpszConnStr, db, CONNSTRSIZE);
 }
 if (uid) {
 if (uid[0]) {
-strcat(lpszConnStr, ";UID=");
-strcat(lpszConnStr, uid);
-strcat(lpszConnStr, ";");
+strlcat(lpszConnStr, ";UID=", CONNSTRSIZE);
+strlcat(lpszConnStr, uid, CONNSTRSIZE);
+strlcat(lpszConnStr, ";", CONNSTRSIZE);
 }
 if (pwd) {
 if (pwd[0]) {
-strcat(lpszConnStr, "PWD=");
-strcat(lpszConnStr, pwd);
-strcat(lpszConnStr, ";");
+strlcat(lpszConnStr, "PWD=", 
CONNSTRSIZE);
+strlcat(lpszConnStr, pwd, CONNSTRSIZE);
+strlcat(lpszConnStr, ";", CONNSTRSIZE);
 }
 }
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/standard file.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 15:03:19 2006 UTC

  Modified files:  
/php-src/ext/standard   file.c 
  Log:
  fix ZTS build
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.480&r2=1.481&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.480 php-src/ext/standard/file.c:1.481
--- php-src/ext/standard/file.c:1.480   Tue Dec 26 22:34:05 2006
+++ php-src/ext/standard/file.c Thu Dec 28 15:03:19 2006
@@ -21,7 +21,7 @@
+--+
  */
 
-/* $Id: file.c,v 1.480 2006/12/26 22:34:05 andrei Exp $ */
+/* $Id: file.c,v 1.481 2006/12/28 15:03:19 tony2001 Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -1288,7 +1288,7 @@
}
 
if (((php_stream *)what)->readbuf_type == IS_UNICODE) {
-   u_buf = php_stream_u_get_line((php_stream *) what, NULL_ZSTR, 
0, 0, NULL TSRMLS_CC);
+   u_buf = php_stream_u_get_line((php_stream *) what, NULL_ZSTR, 
0, 0, NULL);
if (u_buf == NULL) {
efree(args);
RETURN_FALSE;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / run-tests.php

2006-12-28 Thread Nuno Lopes 
nlopess Thu Dec 28 15:06:59 2006 UTC

  Modified files:  
/php-srcrun-tests.php 
  Log:
  force tidy.clean_output=0
  
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.311&r2=1.312&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.311 php-src/run-tests.php:1.312
--- php-src/run-tests.php:1.311 Sat Dec  9 14:17:17 2006
+++ php-src/run-tests.php   Thu Dec 28 15:06:58 2006
@@ -23,7 +23,7 @@
+--+
  */
 
-/* $Id: run-tests.php,v 1.311 2006/12/09 14:17:17 iliaa Exp $ */
+/* $Id: run-tests.php,v 1.312 2006/12/28 15:06:58 nlopess Exp $ */
 
 /* Sanity check to ensure that pcre extension needed by this script is 
available.
  * In the event it is not, print a nice error message indicating that this 
script will
@@ -190,6 +190,7 @@
// check for extensions that need special handling and regenerate
$info_params_ex = array(
'session' => array('session.auto_start=0'),
+   'tidy' => array('tidy.clean_output=0'),
'zlib' => array('zlib.output_compression=Off'),
'xdebug' => array('xdebug.default_enable=0'),
);
@@ -400,7 +401,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
-   echo '$Revision: 1.311 $'."\n";
+   echo '$Revision: 1.312 $'."\n";
exit(1);
default:
echo "Illegal switch specified!\n";

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) / run-tests.php

2006-12-28 Thread Nuno Lopes 
nlopess Thu Dec 28 15:07:45 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcrun-tests.php 
  Log:
  MFH: force tidy.clean_output=0
  
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.19&r2=1.226.2.37.2.20&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.19 
php-src/run-tests.php:1.226.2.37.2.20
--- php-src/run-tests.php:1.226.2.37.2.19   Sat Dec  9 14:14:29 2006
+++ php-src/run-tests.php   Thu Dec 28 15:07:45 2006
@@ -23,7 +23,7 @@
+--+
  */
 
-/* $Id: run-tests.php,v 1.226.2.37.2.19 2006/12/09 14:14:29 iliaa Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.20 2006/12/28 15:07:45 nlopess Exp $ */
 
 /* Sanity check to ensure that pcre extension needed by this script is 
available.
  * In the event it is not, print a nice error message indicating that this 
script will
@@ -202,6 +202,7 @@
// check for extensions that need special handling and regenerate
$info_params_ex = array(
'session' => array('session.auto_start=0'),
+   'tidy' => array('tidy.clean_output=0'),
'zlib' => array('zlib.output_compression=Off'),
'xdebug' => array('xdebug.default_enable=0'),
);
@@ -397,7 +398,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
-   echo '$Revision: 1.226.2.37.2.19 
$'."\n";
+   echo '$Revision: 1.226.2.37.2.20 
$'."\n";
exit(1);
default:
echo "Illegal switch '$switch' 
specified!\n";

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard proc_open.c /main php_logos.c

2006-12-28 Thread Ilia Alshanetsky 
iliaa   Thu Dec 28 15:09:29 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   php_logos.c 
/php-src/ext/standard   proc_open.c 
  Log:
  
  Simplify code and eliminate strcat() usage
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/php_logos.c?r1=1.19.2.1.2.2&r2=1.19.2.1.2.3&diff_format=u
Index: php-src/main/php_logos.c
diff -u php-src/main/php_logos.c:1.19.2.1.2.2 
php-src/main/php_logos.c:1.19.2.1.2.3
--- php-src/main/php_logos.c:1.19.2.1.2.2   Sat Aug 12 19:33:54 2006
+++ php-src/main/php_logos.cThu Dec 28 15:09:29 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_logos.c,v 1.19.2.1.2.2 2006/08/12 19:33:54 nlopess Exp $ */
+/* $Id: php_logos.c,v 1.19.2.1.2.3 2006/12/28 15:09:29 iliaa Exp $ */
 
 #include "php.h"
 #include "logos.h"
@@ -78,13 +78,12 @@
if(FAILURE==zend_hash_find(&phpinfo_logo_hash, (char *) logo_string, 
strlen(logo_string), (void **)&logo_image))
return 0;
 
-   len=strlen(CONTENT_TYPE_HEADER)+logo_image->mimelen;
-   content_header=malloc(len+1);
-   if(!content_header) return 0;
-   strcpy(content_header, CONTENT_TYPE_HEADER);
-   strcat(content_header, logo_image->mimetype);
-   sapi_add_header(content_header, len, 1);
-   free(content_header);
+   len = sizeof(CONTENT_TYPE_HEADER) - 1 + logo_image->mimelen;
+   content_header = emalloc(len + 1);
+   memcpy(content_header, CONTENT_TYPE_HEADER, sizeof(CONTENT_TYPE_HEADER) 
- 1);
+   memcpy(content_header + sizeof(CONTENT_TYPE_HEADER) - 1 , 
logo_image->mimetype, logo_image->mimelen);
+   content_header[len] = '\0';
+   sapi_add_header(content_header, len, 0);
 
PHPWRITE(logo_image->data, logo_image->size);
return 1;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/proc_open.c?r1=1.36.2.1.2.1&r2=1.36.2.1.2.2&diff_format=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.36.2.1.2.1 
php-src/ext/standard/proc_open.c:1.36.2.1.2.2
--- php-src/ext/standard/proc_open.c:1.36.2.1.2.1   Thu Jun  1 14:03:49 2006
+++ php-src/ext/standard/proc_open.cThu Dec 28 15:09:29 2006
@@ -15,7 +15,7 @@
| Author: Wez Furlong <[EMAIL PROTECTED]>   |
+--+
  */
-/* $Id: proc_open.c,v 1.36.2.1.2.1 2006/06/01 14:03:49 tony2001 Exp $ */
+/* $Id: proc_open.c,v 1.36.2.1.2.2 2006/12/28 15:09:29 iliaa Exp $ */
 
 #if 0 && (defined(__linux__) || defined(sun) || defined(__IRIX__))
 # define _BSD_SOURCE   /* linux wants this when XOPEN mode is on */
@@ -248,7 +248,7 @@
 /* {{{ php_make_safe_mode_command */
 static int php_make_safe_mode_command(char *cmd, char **safecmd, int 
is_persistent TSRMLS_DC)
 {
-   int lcmd, larg0, ldir, len, overflow_limit;
+   int lcmd, larg0;
char *space, *sep, *arg0;
 
if (!PG(safe_mode)) {
@@ -257,42 +257,27 @@
}
 
lcmd = strlen(cmd);
-   ldir = strlen(PG(safe_mode_exec_dir));
-   len = lcmd + ldir + 2;
-   overflow_limit = len;
 
-   arg0 = emalloc(len);
-   
-   strcpy(arg0, cmd);
-   
-   space = strchr(arg0, ' ');
+   arg0 = estrndup(cmd, lcmd);
+
+   space = memchr(arg0, ' ', lcmd);
if (space) {
*space = '\0';
+   larg0 = space - arg0;
+   } else {
+   larg0 = lcmd;
}
-   larg0 = strlen(arg0);
 
-   if (strstr(arg0, "..")) {
+   if (php_memnstr(arg0, "..", sizeof("..")-1, arg0 + larg0)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "No '..' components 
allowed in path");
efree(arg0);
return FAILURE;
}
 
-   *safecmd = emalloc(len);
-   strcpy(*safecmd, PG(safe_mode_exec_dir));
-   overflow_limit -= ldir;
-   
-   sep = strrchr(arg0, PHP_DIR_SEPARATOR);
-   if (sep) {
-   strcat(*safecmd, sep);
-   overflow_limit -= strlen(sep);
-   } else {
-   strcat(*safecmd, "/");
-   strcat(*safecmd, arg0);
-   overflow_limit -= larg0 + 1;
-   }
-   if (space) {
-   strncat(*safecmd, cmd + larg0, overflow_limit);
-   }
+   sep = zend_memrchr(arg0, PHP_DIR_SEPARATOR, larg0);
+
+   spprintf(safecmd, 0, "%s%c%s%s", PG(safe_mode_exec_dir), (sep ? *sep : 
'/'), (sep ? "" : arg0), (space ? cmd + larg0 : ""));
+
efree(arg0);
arg0 = php_escape_shell_cmd(*safecmd);
efree(*safecmd);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php_logos.c

2006-12-28 Thread Ilia Alshanetsky 
iliaa   Thu Dec 28 15:10:54 2006 UTC

  Modified files:  
/php-src/main   php_logos.c 
  Log:
  
  MFB: strcat() stuff
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/php_logos.c?r1=1.23&r2=1.24&diff_format=u
Index: php-src/main/php_logos.c
diff -u php-src/main/php_logos.c:1.23 php-src/main/php_logos.c:1.24
--- php-src/main/php_logos.c:1.23   Sat Aug 12 19:41:28 2006
+++ php-src/main/php_logos.cThu Dec 28 15:10:54 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_logos.c,v 1.23 2006/08/12 19:41:28 nlopess Exp $ */
+/* $Id: php_logos.c,v 1.24 2006/12/28 15:10:54 iliaa Exp $ */
 
 #include "php.h"
 #include "logos.h"
@@ -78,13 +78,12 @@
if(FAILURE==zend_hash_find(&phpinfo_logo_hash, (char *) logo_string, 
strlen(logo_string), (void **)&logo_image))
return 0;
 
-   len=strlen(CONTENT_TYPE_HEADER)+logo_image->mimelen;
-   content_header=malloc(len+1);
-   if(!content_header) return 0;
-   strcpy(content_header, CONTENT_TYPE_HEADER);
-   strcat(content_header, logo_image->mimetype);
-   sapi_add_header(content_header, len, 1);
-   free(content_header);
+   len = sizeof(CONTENT_TYPE_HEADER) - 1 + logo_image->mimelen;
+   content_header = emalloc(len + 1);
+   memcpy(content_header, CONTENT_TYPE_HEADER, sizeof(CONTENT_TYPE_HEADER) 
- 1);
+   memcpy(content_header + sizeof(CONTENT_TYPE_HEADER) - 1 , 
logo_image->mimetype, logo_image->mimelen);
+   content_header[len] = '\0';
+   sapi_add_header(content_header, len, 0);
 
PHPWRITE((char*)logo_image->data, logo_image->size);
return 1;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache_hooks php_apache.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 15:14:39 2006 UTC

  Modified files:  
/php-src/sapi/apache_hooks  php_apache.c 
  Log:
  fix build
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.27&r2=1.28&diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.27 
php-src/sapi/apache_hooks/php_apache.c:1.28
--- php-src/sapi/apache_hooks/php_apache.c:1.27 Thu Dec 28 13:30:18 2006
+++ php-src/sapi/apache_hooks/php_apache.c  Thu Dec 28 15:14:39 2006
@@ -17,7 +17,7 @@
|  David Sklar <[EMAIL PROTECTED]> |
+--+
  */
-/* $Id: php_apache.c,v 1.27 2006/12/28 13:30:18 tony2001 Exp $ */
+/* $Id: php_apache.c,v 1.28 2006/12/28 15:14:39 tony2001 Exp $ */
 
 #include "php_apache_http.h"
 
@@ -554,7 +554,7 @@

APREQ_GET_REQUEST(id, r);
 
-   apache_table_to_zval(r->headers_in, 0, return_value);
+   apache_table_to_zval(r->headers_in, return_value);
 }
 /* }}} */
 
@@ -650,7 +650,7 @@
if (ZEND_NUM_ARGS() > 0)
add_header_to_table(r->headers_out, 
INTERNAL_FUNCTION_PARAM_PASSTHRU);
 
-   apache_table_to_zval(r->headers_out, 0, return_value);
+   apache_table_to_zval(r->headers_out, return_value);
 }
 /* }}} */
 
@@ -668,7 +668,7 @@
if (ZEND_NUM_ARGS() > 0)
add_header_to_table(r->err_headers_out, 
INTERNAL_FUNCTION_PARAM_PASSTHRU);
 
-   apache_table_to_zval(r->err_headers_out, 0, return_value);
+   apache_table_to_zval(r->err_headers_out, return_value);
 }
 /* }}} */
 
@@ -1731,7 +1731,7 @@
RETURN_FALSE;
}
 
-   php_output_end_all();
+   php_output_end_all(TSRMLS_C);
php_header(TSRMLS_C);
 
if (run_sub_req(rr)) {
@@ -1761,9 +1761,7 @@
if (tenv[i].key) {
continue;
}
-   if (add_assoc_string(return_value, tenv[i].key, 
(tenv[i].val==NULL) ? "" : tenv[i].val, 1)==FAILURE) {
-   RETURN_FALSE;
-   }
+   add_assoc_string(return_value, tenv[i].key, (tenv[i].val==NULL) 
? "" : tenv[i].val, 1);
 }
 
 }
@@ -1787,7 +1785,7 @@
Fetch all HTTP response headers */
 PHP_FUNCTION(apache_response_headers)
 {
-   apache_table_to_zval(((request_rec *) SG(server_context))->headers_out, 
0, return_value);
+   apache_table_to_zval(((request_rec *) SG(server_context))->headers_out, 
return_value);
 }
 /* }}} */
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pgsql pgsql.c

2006-12-28 Thread Ilia Alshanetsky 
iliaa   Thu Dec 28 15:21:21 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/pgsql  pgsql.c 
  Log:
  
  Added buffer length checks
   
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.331.2.13.2.12&r2=1.331.2.13.2.13&diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.331.2.13.2.12 
php-src/ext/pgsql/pgsql.c:1.331.2.13.2.13
--- php-src/ext/pgsql/pgsql.c:1.331.2.13.2.12   Mon Dec 25 22:36:57 2006
+++ php-src/ext/pgsql/pgsql.c   Thu Dec 28 15:21:21 2006
@@ -20,7 +20,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.331.2.13.2.12 2006/12/25 22:36:57 iliaa Exp $ */
+/* $Id: pgsql.c,v 1.331.2.13.2.13 2006/12/28 15:21:21 iliaa Exp $ */
 
 #include 
 
@@ -5485,7 +5485,7 @@
smart_str_append_long(querystr, Z_LVAL_PP(val));
break;
case IS_DOUBLE:
-   smart_str_appendl(querystr, buf, sprintf(buf, 
"%f", Z_DVAL_PP(val)));
+   smart_str_appendl(querystr, buf, 
MIN(snprintf(buf, sizeof(buf), "%f", Z_DVAL_PP(val)), sizeof(buf)-1));
break;
default:
/* should not happen */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/pgsql pgsql.c

2006-12-28 Thread Ilia Alshanetsky 
iliaa   Thu Dec 28 15:21:32 2006 UTC

  Modified files:  
/php-src/ext/pgsql  pgsql.c 
  Log:
  
  MFB: Added buffer length checks
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.361&r2=1.362&diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.361 php-src/ext/pgsql/pgsql.c:1.362
--- php-src/ext/pgsql/pgsql.c:1.361 Tue Dec 26 17:40:20 2006
+++ php-src/ext/pgsql/pgsql.c   Thu Dec 28 15:21:32 2006
@@ -20,7 +20,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.361 2006/12/26 17:40:20 iliaa Exp $ */
+/* $Id: pgsql.c,v 1.362 2006/12/28 15:21:32 iliaa Exp $ */
 
 #include 
 
@@ -5472,7 +5472,7 @@
smart_str_append_long(querystr, Z_LVAL_PP(val));
break;
case IS_DOUBLE:
-   smart_str_appendl(querystr, buf, sprintf(buf, 
"%f", Z_DVAL_PP(val)));
+   smart_str_appendl(querystr, buf, 
MIN(snprintf(buf, sizeof(buf), "%f", Z_DVAL_PP(val)), sizeof(buf)-1));
break;
default:
/* should not happen */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_4) /ext/pgsql pgsql.c

2006-12-28 Thread Ilia Alshanetsky 
iliaa   Thu Dec 28 15:21:41 2006 UTC

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/pgsql  pgsql.c 
  Log:
  
  MFH: Added buffer length checks
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.244.2.40.2.3&r2=1.244.2.40.2.4&diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.244.2.40.2.3 
php-src/ext/pgsql/pgsql.c:1.244.2.40.2.4
--- php-src/ext/pgsql/pgsql.c:1.244.2.40.2.3Sun Jan  1 13:46:56 2006
+++ php-src/ext/pgsql/pgsql.c   Thu Dec 28 15:21:41 2006
@@ -19,7 +19,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.244.2.40.2.3 2006/01/01 13:46:56 sniper Exp $ */
+/* $Id: pgsql.c,v 1.244.2.40.2.4 2006/12/28 15:21:41 iliaa Exp $ */
 
 #include 
 
@@ -4285,7 +4285,7 @@
smart_str_append_long(querystr, Z_LVAL_PP(val));
break;
case IS_DOUBLE:
-   smart_str_appendl(querystr, buf, sprintf(buf, 
"%f", Z_DVAL_PP(val)));
+   smart_str_appendl(querystr, buf, 
MIN(snprintf(buf, sizeof(buf), "%f", Z_DVAL_PP(val)), sizeof(buf)-1));
break;
default:
/* should not happen */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/embed php_embed.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 15:22:07 2006 UTC

  Modified files:  
/php-src/sapi/embed php_embed.c 
  Log:
  fix sapi/embed build
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/embed/php_embed.c?r1=1.15&r2=1.16&diff_format=u
Index: php-src/sapi/embed/php_embed.c
diff -u php-src/sapi/embed/php_embed.c:1.15 php-src/sapi/embed/php_embed.c:1.16
--- php-src/sapi/embed/php_embed.c:1.15 Sun Jun 25 19:17:20 2006
+++ php-src/sapi/embed/php_embed.c  Thu Dec 28 15:22:07 2006
@@ -15,9 +15,10 @@
| Author: Edin Kadribasic <[EMAIL PROTECTED]>  |
+--+
 */
-/* $Id: php_embed.c,v 1.15 2006/06/25 19:17:20 bjori Exp $ */
+/* $Id: php_embed.c,v 1.16 2006/12/28 15:22:07 tony2001 Exp $ */
 
 #include "php_embed.h"
+#include 
 
 #ifdef PHP_WIN32
 #include 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/dba/libflatfile flatfile.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 15:24:00 2006 UTC

  Modified files:  
/php-src/ext/dba/libflatfileflatfile.c 
  Log:
  use the macro, casting works only with GCC
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dba/libflatfile/flatfile.c?r1=1.17&r2=1.18&diff_format=u
Index: php-src/ext/dba/libflatfile/flatfile.c
diff -u php-src/ext/dba/libflatfile/flatfile.c:1.17 
php-src/ext/dba/libflatfile/flatfile.c:1.18
--- php-src/ext/dba/libflatfile/flatfile.c:1.17 Thu May 11 20:08:45 2006
+++ php-src/ext/dba/libflatfile/flatfile.c  Thu Dec 28 15:24:00 2006
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: flatfile.c,v 1.17 2006/05/11 20:08:45 helly Exp $ */
+/* $Id: flatfile.c,v 1.18 2006/12/28 15:24:00 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -37,7 +37,7 @@
 
 #include "flatfile.h"
 
-#define _php_stream_gets(stream, buf, len) php_stream_gets(stream, 
(zstr)((char*)buf), len)
+#define _php_stream_gets(stream, buf, len) php_stream_gets(stream, 
ZSTR(((char*)buf)), len)
 
 #define FLATFILE_BLOCK_SIZE 1024
 
@@ -308,7 +308,7 @@
 /* {{{ flatfile_version */
 char *flatfile_version() 
 {
-   return "1.0, $Revision: 1.17 $";
+   return "1.0, $Revision: 1.18 $";
 }
 /* }}} */ 
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/fdf fdf.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 15:26:20 2006 UTC

  Modified files:  
/php-src/ext/fdffdf.c 
  Log:
  it's ptr, not ptrptr
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/fdf/fdf.c?r1=1.97&r2=1.98&diff_format=u
Index: php-src/ext/fdf/fdf.c
diff -u php-src/ext/fdf/fdf.c:1.97 php-src/ext/fdf/fdf.c:1.98
--- php-src/ext/fdf/fdf.c:1.97  Sun Jul 23 23:55:26 2006
+++ php-src/ext/fdf/fdf.c   Thu Dec 28 15:26:20 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: fdf.c,v 1.97 2006/07/23 23:55:26 sniper Exp $ */
+/* $Id: fdf.c,v 1.98 2006/12/28 15:26:20 tony2001 Exp $ */
 
 /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html. */
@@ -1818,10 +1818,10 @@
if (!zend_is_callable(callback, 0, &name)) {
convert_to_string(&name);
php_error_docref1(NULL TSRMLS_CC, Z_STRVAL(name), E_WARNING, 
"Second argument is expected to be a valid callback");
-   zval_ptr_dtor(&name);
+   zval_dtor(&name);
RETURN_FALSE;
}
-   zval_ptr_dtor(&name);
+   zval_dtor(&name);
FDF_G(enum_callback) = callback;
FDF_G(enum_fdf) = fdf;
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/mysql php_mysql.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 15:44:51 2006 UTC

  Modified files:  
/php-src/ext/mysql  php_mysql.c 
  Log:
  include basic_functions.h for php_get_current_user() declaration
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.228&r2=1.229&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.228 php-src/ext/mysql/php_mysql.c:1.229
--- php-src/ext/mysql/php_mysql.c:1.228 Wed Nov 22 10:11:58 2006
+++ php-src/ext/mysql/php_mysql.c   Thu Dec 28 15:44:50 2006
@@ -18,7 +18,7 @@
+--+
 */
  
-/* $Id: php_mysql.c,v 1.228 2006/11/22 10:11:58 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.229 2006/12/28 15:44:50 tony2001 Exp $ */
 
 /* TODO:
  *
@@ -33,6 +33,7 @@
 #include "php_globals.h"
 #include "ext/standard/info.h"
 #include "ext/standard/php_string.h"
+#include "ext/standard/basic_functions.h"
 #include "zend_exceptions.h"
 
 #if HAVE_MYSQL

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src /ext/mysql php_mysql.c

2006-12-28 Thread Sudhakar Ganta 

Hi friends,
solve my problem
"Create a program that will take a search phrase as an input, and will then
save to a database the search phrase, the number of results that appear for
that phrase in google, the titles of the top ten results in google, and the
number of times any of the search keywords appears in the title."

regards
Ganta..
On 12/28/06, Antony Dovgal <[EMAIL PROTECTED]> wrote:


tony2001Thu Dec 28 15:44:51 2006 UTC

Modified files:
   /php-src/ext/mysql  php_mysql.c
Log:
include basic_functions.h for php_get_current_user() declaration



http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.228&r2=1.229&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.228 php-src/ext/mysql/php_mysql.c:
1.229
--- php-src/ext/mysql/php_mysql.c:1.228 Wed Nov 22 10:11:58 2006
+++ php-src/ext/mysql/php_mysql.c   Thu Dec 28 15:44:50 2006
@@ -18,7 +18,7 @@

+--+
*/

-/* $Id: php_mysql.c,v 1.228 2006/11/22 10:11:58 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.229 2006/12/28 15:44:50 tony2001 Exp $ */

/* TODO:
*
@@ -33,6 +33,7 @@
#include "php_globals.h"
#include "ext/standard/info.h"
#include "ext/standard/php_string.h"
+#include "ext/standard/basic_functions.h"
#include "zend_exceptions.h"

#if HAVE_MYSQL

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/zlib/tests bug_34821.phpt

2006-12-28 Thread Nuno Lopes 
nlopess Thu Dec 28 19:52:38 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/zlib/tests bug_34821.phpt 
  Log:
  make this test run a little faster (is currently timeout with valgrind)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/bug_34821.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u
Index: php-src/ext/zlib/tests/bug_34821.phpt
diff -u php-src/ext/zlib/tests/bug_34821.phpt:1.1.2.1.2.1 
php-src/ext/zlib/tests/bug_34821.phpt:1.1.2.1.2.2
--- php-src/ext/zlib/tests/bug_34821.phpt:1.1.2.1.2.1   Tue Dec  5 23:03:19 2006
+++ php-src/ext/zlib/tests/bug_34821.phpt   Thu Dec 28 19:52:37 2006
@@ -10,20 +10,20 @@
50, 
500, 
5000, 
-   50,
+   25,
 // 100, // works, but test would take too long
 );
 
-srand(time());
+$s = '';
+$i = 0;
 
 foreach ($b as $size) {
-   $s = '';
-   for ($i = 0; $i <= $size; ++$i) {
+   do {
$s .= chr(rand(0,255));
-   }
-   var_dump($s == gzinflate(gzdeflate($s)));
-   var_dump($s == gzuncompress(gzcompress($s)));
-   var_dump($s == gzinflate(substr(gzencode($s), 10, -8)));
+   } while (++$i < $size);
+   var_dump($s === gzinflate(gzdeflate($s)));
+   var_dump($s === gzuncompress(gzcompress($s)));
+   var_dump($s === gzinflate(substr(gzencode($s), 10, -8)));
 }
 ?>
 --EXPECT--

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/zlib/tests bug_34821.phpt

2006-12-28 Thread Nuno Lopes 
nlopess Thu Dec 28 19:53:30 2006 UTC

  Modified files:  
/php-src/ext/zlib/tests bug_34821.phpt 
  Log:
  MFB
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/bug_34821.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/zlib/tests/bug_34821.phpt
diff -u php-src/ext/zlib/tests/bug_34821.phpt:1.4 
php-src/ext/zlib/tests/bug_34821.phpt:1.5
--- php-src/ext/zlib/tests/bug_34821.phpt:1.4   Tue Dec  5 23:03:42 2006
+++ php-src/ext/zlib/tests/bug_34821.phpt   Thu Dec 28 19:53:30 2006
@@ -10,20 +10,20 @@
50, 
500, 
5000, 
-   50,
+   25,
 // 100, // works, but test would take too long
 );
 
-srand(time());
+$s = '';
+$i = 0;
 
 foreach ($b as $size) {
-   $s = '';
-   for ($i = 0; $i <= $size; ++$i) {
+   do {
$s .= chr(rand(0,255));
-   }
-   var_dump($s == gzinflate(gzdeflate((binary)$s)));
-   var_dump($s == gzuncompress(gzcompress((binary)$s)));
-   var_dump($s == gzinflate(substr(gzencode((binary)$s), 10, -8)));
+   } while (++$i < $size);
+   var_dump($s === gzinflate(gzdeflate($s)));
+   var_dump($s === gzuncompress(gzcompress($s)));
+   var_dump($s === gzinflate(substr(gzencode($s), 10, -8)));
 }
 ?>
 --EXPECT--

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/fdf fdf.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 20:41:10 2006 UTC

  Modified files:  
/php-src/ext/fdffdf.c 
  Log:
  use strlcpy()
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/fdf/fdf.c?r1=1.98&r2=1.99&diff_format=u
Index: php-src/ext/fdf/fdf.c
diff -u php-src/ext/fdf/fdf.c:1.98 php-src/ext/fdf/fdf.c:1.99
--- php-src/ext/fdf/fdf.c:1.98  Thu Dec 28 15:26:20 2006
+++ php-src/ext/fdf/fdf.c   Thu Dec 28 20:41:10 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: fdf.c,v 1.98 2006/12/28 15:26:20 tony2001 Exp $ */
+/* $Id: fdf.c,v 1.99 2006/12/28 20:41:10 tony2001 Exp $ */
 
 /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html. */
@@ -1726,8 +1726,7 @@
RETURN_FALSE;
}
 
-   strncpy(pathbuf , savepath, MAXPATHLEN-1);
-   pathbuf[MAXPATHLEN-1] = '\0';
+   strlcpy(pathbuf, savepath, sizeof(pathbuf));
 
if(0 == stat(pathbuf, &statBuf)) {
is_dir = S_ISDIR(statBuf.st_mode);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/fdf fdf.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 20:41:17 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/fdffdf.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/fdf/fdf.c?r1=1.89.2.2.2.4&r2=1.89.2.2.2.5&diff_format=u
Index: php-src/ext/fdf/fdf.c
diff -u php-src/ext/fdf/fdf.c:1.89.2.2.2.4 php-src/ext/fdf/fdf.c:1.89.2.2.2.5
--- php-src/ext/fdf/fdf.c:1.89.2.2.2.4  Sun Jul 23 23:55:46 2006
+++ php-src/ext/fdf/fdf.c   Thu Dec 28 20:41:17 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: fdf.c,v 1.89.2.2.2.4 2006/07/23 23:55:46 sniper Exp $ */
+/* $Id: fdf.c,v 1.89.2.2.2.5 2006/12/28 20:41:17 tony2001 Exp $ */
 
 /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html. */
@@ -1726,8 +1726,7 @@
RETURN_FALSE;
}
 
-   strncpy(pathbuf , savepath, MAXPATHLEN-1);
-   pathbuf[MAXPATHLEN-1] = '\0';
+   strlcpy(pathbuf, savepath, sizeof(pathbuf));
 
if(0 == stat(pathbuf, &statBuf)) {
is_dir = S_ISDIR(statBuf.st_mode);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_4) /ext/fdf fdf.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 20:41:27 2006 UTC

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/fdffdf.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/fdf/fdf.c?r1=1.66.2.13.2.1&r2=1.66.2.13.2.2&diff_format=u
Index: php-src/ext/fdf/fdf.c
diff -u php-src/ext/fdf/fdf.c:1.66.2.13.2.1 php-src/ext/fdf/fdf.c:1.66.2.13.2.2
--- php-src/ext/fdf/fdf.c:1.66.2.13.2.1 Sun Jan  1 13:46:52 2006
+++ php-src/ext/fdf/fdf.c   Thu Dec 28 20:41:27 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: fdf.c,v 1.66.2.13.2.1 2006/01/01 13:46:52 sniper Exp $ */
+/* $Id: fdf.c,v 1.66.2.13.2.2 2006/12/28 20:41:27 tony2001 Exp $ */
 
 /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html. */
@@ -1492,8 +1492,7 @@
RETURN_FALSE;
}
 
-   strncpy(pathbuf , savepath, MAXPATHLEN-1);
-   pathbuf[MAXPATHLEN-1] = '\0';
+   strlcpy(pathbuf, savepath, sizeof(pathbuf));
 
if(0 == stat(pathbuf, &statBuf)) {
is_dir = S_ISDIR(statBuf.st_mode);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/mime_magic mime_magic.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 20:45:20 2006 UTC

  Modified files:  
/php-src/ext/mime_magic mime_magic.c 
  Log:
  use strlcpy()
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mime_magic/mime_magic.c?r1=1.52&r2=1.53&diff_format=u
Index: php-src/ext/mime_magic/mime_magic.c
diff -u php-src/ext/mime_magic/mime_magic.c:1.52 
php-src/ext/mime_magic/mime_magic.c:1.53
--- php-src/ext/mime_magic/mime_magic.c:1.52Thu Nov 30 15:13:33 2006
+++ php-src/ext/mime_magic/mime_magic.c Thu Dec 28 20:45:20 2006
@@ -15,7 +15,7 @@
   | Author: Hartmut Holzgraefe  <[EMAIL PROTECTED]>   |
   +--+
 
-  $Id: mime_magic.c,v 1.52 2006/11/30 15:13:33 iliaa Exp $ 
+  $Id: mime_magic.c,v 1.53 2006/12/28 20:45:20 tony2001 Exp $ 
 
   This module contains a lot of stuff taken from Apache mod_mime_magic,
   so the license section is a little bit longer than usual:
@@ -730,9 +730,7 @@
return -1;
}

-   strncpy(m->desc, l, sizeof(m->desc) - 1);
-   m->desc[sizeof(m->desc) - 1] = '\0';
-
+   strlcpy(m->desc, l, sizeof(m->desc));
 return 0;
 }
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mime_magic mime_magic.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 20:45:27 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/mime_magic mime_magic.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mime_magic/mime_magic.c?r1=1.42.2.5.2.3&r2=1.42.2.5.2.4&diff_format=u
Index: php-src/ext/mime_magic/mime_magic.c
diff -u php-src/ext/mime_magic/mime_magic.c:1.42.2.5.2.3 
php-src/ext/mime_magic/mime_magic.c:1.42.2.5.2.4
--- php-src/ext/mime_magic/mime_magic.c:1.42.2.5.2.3Thu Nov 30 15:13:19 2006
+++ php-src/ext/mime_magic/mime_magic.c Thu Dec 28 20:45:27 2006
@@ -15,7 +15,7 @@
   | Author: Hartmut Holzgraefe  <[EMAIL PROTECTED]>   |
   +--+
 
-  $Id: mime_magic.c,v 1.42.2.5.2.3 2006/11/30 15:13:19 iliaa Exp $ 
+  $Id: mime_magic.c,v 1.42.2.5.2.4 2006/12/28 20:45:27 tony2001 Exp $ 
 
   This module contains a lot of stuff taken from Apache mod_mime_magic,
   so the license section is a little bit longer than usual:
@@ -730,9 +730,7 @@
return -1;
}

-   strncpy(m->desc, l, sizeof(m->desc) - 1);
-   m->desc[sizeof(m->desc) - 1] = '\0';
-
+   strlcpy(m->desc, l, sizeof(m->desc));
 return 0;
 }
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_4) /ext/mime_magic mime_magic.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 20:45:36 2006 UTC

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/mime_magic mime_magic.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mime_magic/mime_magic.c?r1=1.13.2.13.2.1&r2=1.13.2.13.2.2&diff_format=u
Index: php-src/ext/mime_magic/mime_magic.c
diff -u php-src/ext/mime_magic/mime_magic.c:1.13.2.13.2.1 
php-src/ext/mime_magic/mime_magic.c:1.13.2.13.2.2
--- php-src/ext/mime_magic/mime_magic.c:1.13.2.13.2.1   Sun Jan  1 13:46:54 2006
+++ php-src/ext/mime_magic/mime_magic.c Thu Dec 28 20:45:36 2006
@@ -15,7 +15,7 @@
   | Author: Hartmut Holzgraefe  <[EMAIL PROTECTED]>   |
   +--+
 
-  $Id: mime_magic.c,v 1.13.2.13.2.1 2006/01/01 13:46:54 sniper Exp $ 
+  $Id: mime_magic.c,v 1.13.2.13.2.2 2006/12/28 20:45:36 tony2001 Exp $ 
 
   This module contains a lot of stuff taken from Apache mod_mime_magic,
   so the license section is a little bit longer than usual:
@@ -651,9 +651,7 @@
 }
 else
m->nospflag = 0;
-strncpy(m->desc, l, sizeof(m->desc) - 1);
-m->desc[sizeof(m->desc) - 1] = '\0';
-
+strlcpy(m->desc, l, sizeof(m->desc));
 return 0;
 }
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: CVSROOT / avail

2006-12-28 Thread Martin Jansen 
mj  Thu Dec 28 21:45:26 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * Net_IMAP karma for Sebastian Ebling
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1228&r2=1.1229&diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1228 CVSROOT/avail:1.1229
--- CVSROOT/avail:1.1228Fri Dec 22 16:22:53 2006
+++ CVSROOT/avail   Thu Dec 28 21:45:26 2006
@@ -369,6 +369,7 @@
 avail|zhaowei|pecl/mailparse
 avail|wormus|pear/Validate,peardoc
 avail|aharvey|pear/Auth,pear/Config,pear/DB,peardoc
+avail|hudeldudel|pear/Net_IMAP,peardoc
 
 # php windows installer
 avail|jmertic|php-src/win32/installer

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/cgi cgi_main.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 22:36:53 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/sapi/cgi   cgi_main.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.18&r2=1.267.2.15.2.19&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.18 
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.19
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.18 Wed Nov 15 13:33:41 2006
+++ php-src/sapi/cgi/cgi_main.c Thu Dec 28 22:36:53 2006
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.267.2.15.2.18 2006/11/15 13:33:41 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.19 2006/12/28 22:36:53 tony2001 Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -849,7 +849,7 @@
int path_translated_len 
= 0;
char *path_translated = 
NULL;

-   if (env_document_root[l 
- 1] == '/') {
+   if (l && 
env_document_root[l - 1] == '/') {
--l;
}
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/cgi cgi_main.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 22:36:45 2006 UTC

  Modified files:  
/php-src/sapi/cgi   cgi_main.c 
  Log:
  make sure l != 0
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.305&r2=1.306&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.305 php-src/sapi/cgi/cgi_main.c:1.306
--- php-src/sapi/cgi/cgi_main.c:1.305   Wed Nov 15 13:34:05 2006
+++ php-src/sapi/cgi/cgi_main.c Thu Dec 28 22:36:45 2006
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.305 2006/11/15 13:34:05 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.306 2006/12/28 22:36:45 tony2001 Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -825,7 +825,7 @@
int path_translated_len 
= 0;
char *path_translated = 
NULL;

-   if (env_document_root[l 
- 1] == '/') {
+   if (l && 
env_document_root[l - 1] == '/') {
--l;
}
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_4) /sapi/cgi cgi_main.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 22:37:00 2006 UTC

  Modified files:  (Branch: PHP_4_4)
/php-src/sapi/cgi   cgi_main.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.190.2.68.2.5&r2=1.190.2.68.2.6&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.190.2.68.2.5 
php-src/sapi/cgi/cgi_main.c:1.190.2.68.2.6
--- php-src/sapi/cgi/cgi_main.c:1.190.2.68.2.5  Wed Feb 22 15:11:53 2006
+++ php-src/sapi/cgi/cgi_main.c Thu Dec 28 22:36:59 2006
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.190.2.68.2.5 2006/02/22 15:11:53 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.190.2.68.2.6 2006/12/28 22:36:59 tony2001 Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -811,7 +811,7 @@
int l = 
strlen(env_document_root);
int path_translated_len 
= 0;
char *path_translated = 
NULL;
-   if 
(env_document_root[l-1]=='/') {
+   if (l && 
env_document_root[l-1]=='/') {
--l;
}
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/pgsql pgsql.c /ext/pgsql/tests 80_bug39971.phpt

2006-12-28 Thread Ilia Alshanetsky 
iliaa   Fri Dec 29 00:34:30 2006 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/pgsql/tests80_bug39971.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/pgsql  pgsql.c 
  Log:
  
  Fixed bug #39971 (pg_insert/pg_update do not allow now() to be used for   
  timestamp fields).
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.463&r2=1.2027.2.547.2.464&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.463 php-src/NEWS:1.2027.2.547.2.464
--- php-src/NEWS:1.2027.2.547.2.463 Tue Dec 26 16:55:56 2006
+++ php-src/NEWSFri Dec 29 00:34:29 2006
@@ -17,6 +17,8 @@
   __inet_pton() and inet_ntop() was named __inet_ntop(). (Hannes)
 - Fixed the validate email filter so that the letter "v" can also be used in
   the user part of the email address. (Derick)
+- Fixed bug #39971 (pg_insert/pg_update do not allow now() to be used for
+  timestamp fields). (Ilia)
 - Fixed bug #39952 (zip ignoring --with-libdir on zlib checks) (judas dot
   iscariote at gmail dot com)
 - Fixed bug #39944 (References broken). (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.331.2.13.2.13&r2=1.331.2.13.2.14&diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.331.2.13.2.13 
php-src/ext/pgsql/pgsql.c:1.331.2.13.2.14
--- php-src/ext/pgsql/pgsql.c:1.331.2.13.2.13   Thu Dec 28 15:21:21 2006
+++ php-src/ext/pgsql/pgsql.c   Fri Dec 29 00:34:29 2006
@@ -20,7 +20,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.331.2.13.2.13 2006/12/28 15:21:21 iliaa Exp $ */
+/* $Id: pgsql.c,v 1.331.2.13.2.14 2006/12/29 00:34:29 iliaa Exp $ */
 
 #include 
 
@@ -4968,14 +4968,14 @@
switch(Z_TYPE_PP(val)) {
case IS_STRING:
if (Z_STRLEN_PP(val) == 0) {
-   ZVAL_STRING(new_val, 
"NULL", 1);
-   }
-   else {
+   ZVAL_STRINGL(new_val, 
"NULL", sizeof("NULL")-1, 1);
+   } else if 
(!strcasecmp(Z_STRVAL_PP(val), "now()")) {
+   ZVAL_STRINGL(new_val, 
"NOW()", sizeof("NOW()")-1, 1);
+   } else {
/* FIXME: better regex 
must be used */
if 
(php_pgsql_convert_match(Z_STRVAL_PP(val), 
"^([0-9]{4}[/-][0-9]{1,2}[/-][0-9]{1,2})([ 
\\t]+(([0-9]{1,2}:[0-9]{1,2}){1}(:[0-9]{1,2}){0,1}(\\.[0-9]+){0,1}([ 
\\t]*([+-][0-9]{1,2}(:[0-9]{1,2}){0,1}|[a-zA-Z]{1,5})){0,1})){0,1}$", 1 
TSRMLS_CC) == FAILURE) {
err = 1;
-   }
-   else {
+   } else {

ZVAL_STRING(new_val, Z_STRVAL_PP(val), 1);

php_pgsql_add_quotes(new_val, 1 TSRMLS_CC);
}
@@ -4983,7 +4983,7 @@
break;

case IS_NULL:
-   ZVAL_STRING(new_val, "NULL", 1);
+   ZVAL_STRINGL(new_val, "NULL", 
sizeof("NULL")-1, 1);
break;
 
default:

http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/tests/80_bug39971.phpt?view=markup&rev=1.1
Index: php-src/ext/pgsql/tests/80_bug39971.phpt
+++ php-src/ext/pgsql/tests/80_bug39971.phpt

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /ext/pgsql pgsql.c

2006-12-28 Thread Ilia Alshanetsky 
iliaa   Fri Dec 29 00:35:26 2006 UTC

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/pgsql  pgsql.c 
/php-srcNEWS 
  Log:
  
  MFH: Fixed bug #39971 (pg_insert/pg_update do not allow now() to be used for  
 
  timestamp fields).
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.244.2.40.2.4&r2=1.244.2.40.2.5&diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.244.2.40.2.4 
php-src/ext/pgsql/pgsql.c:1.244.2.40.2.5
--- php-src/ext/pgsql/pgsql.c:1.244.2.40.2.4Thu Dec 28 15:21:41 2006
+++ php-src/ext/pgsql/pgsql.c   Fri Dec 29 00:35:25 2006
@@ -19,7 +19,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.244.2.40.2.4 2006/12/28 15:21:41 iliaa Exp $ */
+/* $Id: pgsql.c,v 1.244.2.40.2.5 2006/12/29 00:35:25 iliaa Exp $ */
 
 #include 
 
@@ -3772,14 +3772,14 @@
switch(Z_TYPE_PP(val)) {
case IS_STRING:
if (Z_STRLEN_PP(val) == 0) {
-   ZVAL_STRING(new_val, 
"NULL", 1);
-   }
-   else {
+   ZVAL_STRINGL(new_val, 
"NULL", sizeof("NULL")-1, 1);
+   } else if 
(!strcasecmp(Z_STRVAL_PP(val), "now()")) {
+   ZVAL_STRINGL(new_val, 
"NOW()", sizeof("NOW()")-1, 1);
+   } else {
/* FIXME: better regex 
must be used */
if 
(php_pgsql_convert_match(Z_STRVAL_PP(val), 
"^([0-9]{4}[/-][0-9]{1,2}[/-][0-9]{1,2})([ 
\\t]+(([0-9]{1,2}:[0-9]{1,2}){1}(:[0-9]{1,2}){0,1}(\\.[0-9]+){0,1}([ 
\\t]*([+-][0-9]{1,2}(:[0-9]{1,2}){0,1}|[a-zA-Z]{1,5})){0,1})){0,1}$", 1 
TSRMLS_CC) == FAILURE) {
err = 1;
-   }
-   else {
+   } else {

ZVAL_STRING(new_val, Z_STRVAL_PP(val), 1);

php_pgsql_add_quotes(new_val, 1 TSRMLS_CC);
}
@@ -3787,7 +3787,7 @@
break;

case IS_NULL:
-   ZVAL_STRING(new_val, "NULL", 1);
+   ZVAL_STRINGL(new_val, "NULL", 
sizeof("NULL")-1, 1);
break;
 
default:
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.179&r2=1.1247.2.920.2.180&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.179 php-src/NEWS:1.1247.2.920.2.180
--- php-src/NEWS:1.1247.2.920.2.179 Mon Dec 25 15:42:35 2006
+++ php-src/NEWSFri Dec 29 00:35:25 2006
@@ -5,6 +5,8 @@
   indexing the page. (Ilia)
 - Updated PCRE to version 6.7. (Ilia)
 - Fixed missing open_basedir check inside chdir() function. (Ilia)
+- Fixed bug #39971 (pg_insert/pg_update do not allow now() to be used for   
+  timestamp fields). (Ilia)
 - Fixed bug #39890 (using autoconf 2.6x and --with-layout=GNU breaks PEAR 
   install path). (Tony)
 - Fixed bug #39653 (ext/dba doesn't check for db-4.5 and db-4.4 when db4 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/pgsql pgsql.c

2006-12-28 Thread Ilia Alshanetsky 
iliaa   Fri Dec 29 00:34:53 2006 UTC

  Modified files:  
/php-src/ext/pgsql  pgsql.c 
  Log:
  MFB: Fixed bug #39971 (pg_insert/pg_update do not allow now() to be used for  
 
  timestamp fields).
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.362&r2=1.363&diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.362 php-src/ext/pgsql/pgsql.c:1.363
--- php-src/ext/pgsql/pgsql.c:1.362 Thu Dec 28 15:21:32 2006
+++ php-src/ext/pgsql/pgsql.c   Fri Dec 29 00:34:53 2006
@@ -20,7 +20,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.362 2006/12/28 15:21:32 iliaa Exp $ */
+/* $Id: pgsql.c,v 1.363 2006/12/29 00:34:53 iliaa Exp $ */
 
 #include 
 
@@ -4955,14 +4955,14 @@
switch(Z_TYPE_PP(val)) {
case IS_STRING:
if (Z_STRLEN_PP(val) == 0) {
-   ZVAL_STRING(new_val, 
"NULL", 1);
-   }
-   else {
+   ZVAL_STRINGL(new_val, 
"NULL", sizeof("NULL")-1, 1);
+   } else if 
(!strcasecmp(Z_STRVAL_PP(val), "now()")) {
+   ZVAL_STRINGL(new_val, 
"NOW()", sizeof("NOW()")-1, 1);
+   } else {
/* FIXME: better regex 
must be used */
if 
(php_pgsql_convert_match(Z_STRVAL_PP(val), 
"^([0-9]{4}[/-][0-9]{1,2}[/-][0-9]{1,2})([ 
\\t]+(([0-9]{1,2}:[0-9]{1,2}){1}(:[0-9]{1,2}){0,1}(\\.[0-9]+){0,1}([ 
\\t]*([+-][0-9]{1,2}(:[0-9]{1,2}){0,1}|[a-zA-Z]{1,5})){0,1})){0,1}$", 1 
TSRMLS_CC) == FAILURE) {
err = 1;
-   }
-   else {
+   } else {

ZVAL_STRING(new_val, Z_STRVAL_PP(val), 1);

php_pgsql_add_quotes(new_val, 1 TSRMLS_CC);
}
@@ -4970,7 +4970,7 @@
break;

case IS_NULL:
-   ZVAL_STRING(new_val, "NULL", 1);
+   ZVAL_STRINGL(new_val, "NULL", 
sizeof("NULL")-1, 1);
break;
 
default:

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php