[PHP-CVS] cvs: php-src(PHP_5_2) /win32/build template.rc

2008-11-03 Thread Elizabeth Marie Smith 
auroraeosrose   Mon Nov  3 19:28:23 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/win32/buildtemplate.rc 
  Log:
  MFH
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/template.rc?r1=1.7.2.2.2.1&r2=1.7.2.2.2.2&diff_format=u
Index: php-src/win32/build/template.rc
diff -u php-src/win32/build/template.rc:1.7.2.2.2.1 
php-src/win32/build/template.rc:1.7.2.2.2.2
--- php-src/win32/build/template.rc:1.7.2.2.2.1 Mon Jan  1 19:32:09 2007
+++ php-src/win32/build/template.rc Mon Nov  3 19:28:23 2008
@@ -1,11 +1,11 @@
 /* This is a template RC file.
- * $Id: template.rc,v 1.7.2.2.2.1 2007/01/01 19:32:09 iliaa Exp $
+ * $Id: template.rc,v 1.7.2.2.2.2 2008/11/03 19:28:23 auroraeosrose Exp $
  * Do not edit with MSVC */
 #ifdef APSTUDIO_INVOKED
 # error dont edit with MSVC
 #endif
 
-#include "winres.h"
+#include "winresrc.h"
 #include "main/php_version.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US



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

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build template.rc

2008-11-03 Thread Elizabeth Marie Smith 
auroraeosrose   Mon Nov  3 19:25:42 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildtemplate.rc 
  Log:
  MFH
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/template.rc?r1=1.7.2.2.2.1.2.1&r2=1.7.2.2.2.1.2.2&diff_format=u
Index: php-src/win32/build/template.rc
diff -u php-src/win32/build/template.rc:1.7.2.2.2.1.2.1 
php-src/win32/build/template.rc:1.7.2.2.2.1.2.2
--- php-src/win32/build/template.rc:1.7.2.2.2.1.2.1 Sat Mar 22 09:07:59 2008
+++ php-src/win32/build/template.rc Mon Nov  3 19:25:42 2008
@@ -1,11 +1,11 @@
 /* This is a template RC file.
- * $Id: template.rc,v 1.7.2.2.2.1.2.1 2008/03/22 09:07:59 sfox Exp $
+ * $Id: template.rc,v 1.7.2.2.2.1.2.2 2008/11/03 19:25:42 auroraeosrose Exp $
  * Do not edit with MSVC */
 #ifdef APSTUDIO_INVOKED
 # error dont edit with MSVC
 #endif
 
-#include "winres.h"
+#include "winresrc.h"
 #include "main/php_version.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US



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

[PHP-CVS] cvs: php-src /win32/build template.rc

2008-11-03 Thread Elizabeth Marie Smith 
auroraeosrose   Mon Nov  3 19:24:47 2008 UTC

  Modified files:  
/php-src/win32/buildtemplate.rc 
  Log:
  Actual name of the file is WinResRc.h - silly to make people rename their 
header files
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/template.rc?r1=1.11&r2=1.12&diff_format=u
Index: php-src/win32/build/template.rc
diff -u php-src/win32/build/template.rc:1.11 
php-src/win32/build/template.rc:1.12
--- php-src/win32/build/template.rc:1.11Wed May 14 11:18:08 2008
+++ php-src/win32/build/template.rc Mon Nov  3 19:24:47 2008
@@ -1,11 +1,11 @@
 /* This is a template RC file.
- * $Id: template.rc,v 1.11 2008/05/14 11:18:08 mattwil Exp $
+ * $Id: template.rc,v 1.12 2008/11/03 19:24:47 auroraeosrose Exp $
  * Do not edit with MSVC */
 #ifdef APSTUDIO_INVOKED
 # error dont edit with MSVC
 #endif
 
-#include "winres.h"
+#include "winresrc.h"
 #include "main/php_version.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US



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

[PHP-CVS] cvs: php-src /ext/pdo_sqlite config.w32

2008-08-06 Thread Elizabeth Marie Smith 
auroraeosrose   Wed Aug  6 16:57:08 2008 UTC

  Modified files:  
/php-src/ext/pdo_sqlite config.w32 
  Log:
  Stupid typo
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.w32?r1=1.14&r2=1.15&diff_format=u
Index: php-src/ext/pdo_sqlite/config.w32
diff -u php-src/ext/pdo_sqlite/config.w32:1.14 
php-src/ext/pdo_sqlite/config.w32:1.15
--- php-src/ext/pdo_sqlite/config.w32:1.14  Wed Aug  6 16:48:19 2008
+++ php-src/ext/pdo_sqlite/config.w32   Wed Aug  6 16:57:08 2008
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.14 2008/08/06 16:48:19 auroraeosrose Exp $
+// $Id: config.w32,v 1.15 2008/08/06 16:57:08 auroraeosrose Exp $
 // vim:ft=javascript
 
 ARG_WITH("pdo-sqlite", "for pdo_sqlite support", "no");
 
 if (PHP_PDO_SQLITE != "no") {
-   EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c", null, "/DSQLITE_THREADSAFE=1 /I" + 
configure_module_dirname + ""/../sqlite3/libsqlite /I" + 
configure_module_dirname);
+   EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c", null, "/DSQLITE_THREADSAFE=1 /I" + 
configure_module_dirname + "/../sqlite3/libsqlite /I" + 
configure_module_dirname);

ADD_EXTENSION_DEP('pdo_sqlite', 'pdo');
// If pdo_sqlite is static, and sqlite3 is also static, then we don't 
add a second copy of the sqlite3 libs



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo_sqlite config.w32

2008-08-06 Thread Elizabeth Marie Smith 
auroraeosrose   Wed Aug  6 16:56:36 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pdo_sqlite config.w32 
  Log:
  Stupid typo
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.w32?r1=1.6.2.1.2.3.2.7&r2=1.6.2.1.2.3.2.8&diff_format=u
Index: php-src/ext/pdo_sqlite/config.w32
diff -u php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.7 
php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.8
--- php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.7   Wed Aug  6 16:47:38 2008
+++ php-src/ext/pdo_sqlite/config.w32   Wed Aug  6 16:56:35 2008
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.6.2.1.2.3.2.7 2008/08/06 16:47:38 auroraeosrose Exp $
+// $Id: config.w32,v 1.6.2.1.2.3.2.8 2008/08/06 16:56:35 auroraeosrose Exp $
 // vim:ft=javascript
 
 ARG_WITH("pdo-sqlite", "for pdo_sqlite support", "no");
 
 if (PHP_PDO_SQLITE != "no") {
-   EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c", null, "/DSQLITE_THREADSAFE=1 /I" + 
configure_module_dirname + ""/../sqlite3/libsqlite /I" + 
configure_module_dirname);
+   EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c", null, "/DSQLITE_THREADSAFE=1 /I" + 
configure_module_dirname + "/../sqlite3/libsqlite /I" + 
configure_module_dirname);

ADD_EXTENSION_DEP('pdo_sqlite', 'pdo');
// If pdo_sqlite is static, and sqlite3 is also static, then we don't 
add a second copy of the sqlite3 libs



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

[PHP-CVS] cvs: php-src /ext/pdo_sqlite config.w32

2008-08-06 Thread Elizabeth Marie Smith 
auroraeosrose   Wed Aug  6 16:48:19 2008 UTC

  Modified files:  
/php-src/ext/pdo_sqlite config.w32 
  Log:
  Fix include path
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.w32?r1=1.13&r2=1.14&diff_format=u
Index: php-src/ext/pdo_sqlite/config.w32
diff -u php-src/ext/pdo_sqlite/config.w32:1.13 
php-src/ext/pdo_sqlite/config.w32:1.14
--- php-src/ext/pdo_sqlite/config.w32:1.13  Tue Aug  5 20:22:53 2008
+++ php-src/ext/pdo_sqlite/config.w32   Wed Aug  6 16:48:19 2008
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.13 2008/08/05 20:22:53 auroraeosrose Exp $
+// $Id: config.w32,v 1.14 2008/08/06 16:48:19 auroraeosrose Exp $
 // vim:ft=javascript
 
 ARG_WITH("pdo-sqlite", "for pdo_sqlite support", "no");
 
 if (PHP_PDO_SQLITE != "no") {
-   EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c", null, "/DSQLITE_THREADSAFE=1 /I" + 
configure_module_dirname + "/libsqlite /I" + configure_module_dirname);
+   EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c", null, "/DSQLITE_THREADSAFE=1 /I" + 
configure_module_dirname + ""/../sqlite3/libsqlite /I" + 
configure_module_dirname);

ADD_EXTENSION_DEP('pdo_sqlite', 'pdo');
// If pdo_sqlite is static, and sqlite3 is also static, then we don't 
add a second copy of the sqlite3 libs



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo_sqlite config.w32

2008-08-06 Thread Elizabeth Marie Smith 
auroraeosrose   Wed Aug  6 16:47:38 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pdo_sqlite config.w32 
  Log:
  Fix include path
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.w32?r1=1.6.2.1.2.3.2.6&r2=1.6.2.1.2.3.2.7&diff_format=u
Index: php-src/ext/pdo_sqlite/config.w32
diff -u php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.6 
php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.7
--- php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.6   Tue Aug  5 20:16:21 2008
+++ php-src/ext/pdo_sqlite/config.w32   Wed Aug  6 16:47:38 2008
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.6.2.1.2.3.2.6 2008/08/05 20:16:21 auroraeosrose Exp $
+// $Id: config.w32,v 1.6.2.1.2.3.2.7 2008/08/06 16:47:38 auroraeosrose Exp $
 // vim:ft=javascript
 
 ARG_WITH("pdo-sqlite", "for pdo_sqlite support", "no");
 
 if (PHP_PDO_SQLITE != "no") {
-   EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c", null, "/DSQLITE_THREADSAFE=1 /I" + 
configure_module_dirname + "/libsqlite /I" + configure_module_dirname);
+   EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c", null, "/DSQLITE_THREADSAFE=1 /I" + 
configure_module_dirname + ""/../sqlite3/libsqlite /I" + 
configure_module_dirname);

ADD_EXTENSION_DEP('pdo_sqlite', 'pdo');
// If pdo_sqlite is static, and sqlite3 is also static, then we don't 
add a second copy of the sqlite3 libs



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

[PHP-CVS] cvs: php-src /ext/pdo_sqlite config.w32 /ext/sqlite3 config.w32

2008-08-05 Thread Elizabeth Marie Smith 
auroraeosrose   Tue Aug  5 20:22:54 2008 UTC

  Modified files:  
/php-src/ext/pdo_sqlite config.w32 
/php-src/ext/sqlite3config.w32 
  Log:
  Some fancy detection for sqlite3 and pdo_sqlite3 - so the two extensions 
don't depend on each other if shared, and don't try to put two versions of the 
sqlite3 lib if static
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.w32?r1=1.12&r2=1.13&diff_format=u
Index: php-src/ext/pdo_sqlite/config.w32
diff -u php-src/ext/pdo_sqlite/config.w32:1.12 
php-src/ext/pdo_sqlite/config.w32:1.13
--- php-src/ext/pdo_sqlite/config.w32:1.12  Thu Jul 24 14:20:51 2008
+++ php-src/ext/pdo_sqlite/config.w32   Tue Aug  5 20:22:53 2008
@@ -1,13 +1,16 @@
-// $Id: config.w32,v 1.12 2008/07/24 14:20:51 scottmac Exp $
+// $Id: config.w32,v 1.13 2008/08/05 20:22:53 auroraeosrose Exp $
 // vim:ft=javascript
 
 ARG_WITH("pdo-sqlite", "for pdo_sqlite support", "no");
 
 if (PHP_PDO_SQLITE != "no") {
EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c", null, "/DSQLITE_THREADSAFE=1 /I" + 
configure_module_dirname + "/libsqlite /I" + configure_module_dirname);
-   ADD_SOURCES(configure_module_dirname + "/libsqlite", "sqlite3.c", 
"pdo_sqlite");
-
+   
ADD_EXTENSION_DEP('pdo_sqlite', 'pdo');
+   // If pdo_sqlite is static, and sqlite3 is also static, then we don't 
add a second copy of the sqlite3 libs
+   if (PHP_PDO_SQLITE_SHARED || PHP_SQLITE3_SHARED || PHP_SQLITE3 == 'no') 
{
+   ADD_SOURCES(configure_module_dirname + "/../sqlite3/libsqlite", 
"sqlite3.c", "pdo_sqlite");
+   }
 }
 
 ARG_WITH("pdo-sqlite-external", "for pdo_sqlite support from an external dll", 
"no");
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/config.w32?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/sqlite3/config.w32
diff -u php-src/ext/sqlite3/config.w32:1.2 php-src/ext/sqlite3/config.w32:1.3
--- php-src/ext/sqlite3/config.w32:1.2  Sat Jul 26 01:23:45 2008
+++ php-src/ext/sqlite3/config.w32  Tue Aug  5 20:22:53 2008
@@ -1,17 +1,13 @@
-// $Id: config.w32,v 1.2 2008/07/26 01:23:45 scottmac Exp $
-// vim:ft=javascript
-
-ARG_WITH("sqlite3", "SQLite 3 support", "no");
-
-if (PHP_SQLITE3 != "no") {
-   ADD_FLAG("CFLAGS_SQLITE3", "/D SQLITE_THREADSAFE=1 /D 
SQLITE_ENABLE_FTS3=1 /D SQLITE_CORE=1 ");
-   EXTENSION("sqlite3", "sqlite3.c", null, "/I" + configure_module_dirname 
+ "/libsqlite /I" + configure_module_dirname);
-
-   ADD_SOURCES(configure_module_dirname + "/libsqlite", "sqlite3.c", 
"sqlite3");
-
-   AC_DEFINE("HAVE_SQLITE3", 1, "SQLite support");
-
-   if (!PHP_SQLITE3_SHARED) {
-   ADD_DEF_FILE(configure_module_dirname + "\\php_sqlite3.def");
-   }
-}
+// $Id: config.w32,v 1.3 2008/08/05 20:22:53 auroraeosrose Exp $
+// vim:ft=javascript
+
+ARG_WITH("sqlite3", "SQLite 3 support", "no");
+
+if (PHP_SQLITE3 != "no") {
+   ADD_FLAG("CFLAGS_SQLITE3", "/D SQLITE_THREADSAFE=1 /D 
SQLITE_ENABLE_FTS3=1 /D SQLITE_CORE=1 ");
+   EXTENSION("sqlite3", "sqlite3.c", null, "/I" + configure_module_dirname 
+ "/libsqlite /I" + configure_module_dirname);
+
+   ADD_SOURCES(configure_module_dirname + "/libsqlite", "sqlite3.c", 
"sqlite3");
+
+   AC_DEFINE("HAVE_SQLITE3", 1, "SQLite support");
+}



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo_sqlite config.w32 /ext/sqlite3 config.w32

2008-08-05 Thread Elizabeth Marie Smith 
auroraeosrose   Tue Aug  5 20:16:21 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pdo_sqlite config.w32 
/php-src/ext/sqlite3config.w32 
  Log:
  Some fancy detection for sqlite3 and pdo_sqlite3 - so the two extensions 
don't depend on each other if shared, and don't try to put two versions of the 
sqlite3 lib if static
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.w32?r1=1.6.2.1.2.3.2.5&r2=1.6.2.1.2.3.2.6&diff_format=u
Index: php-src/ext/pdo_sqlite/config.w32
diff -u php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.5 
php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.6
--- php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.5   Thu Jul 24 14:25:33 2008
+++ php-src/ext/pdo_sqlite/config.w32   Tue Aug  5 20:16:21 2008
@@ -1,13 +1,16 @@
-// $Id: config.w32,v 1.6.2.1.2.3.2.5 2008/07/24 14:25:33 scottmac Exp $
+// $Id: config.w32,v 1.6.2.1.2.3.2.6 2008/08/05 20:16:21 auroraeosrose Exp $
 // vim:ft=javascript
 
 ARG_WITH("pdo-sqlite", "for pdo_sqlite support", "no");
 
 if (PHP_PDO_SQLITE != "no") {
EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c", null, "/DSQLITE_THREADSAFE=1 /I" + 
configure_module_dirname + "/libsqlite /I" + configure_module_dirname);
-   ADD_SOURCES(configure_module_dirname + "/libsqlite", "sqlite3.c", 
"pdo_sqlite");
-
+   
ADD_EXTENSION_DEP('pdo_sqlite', 'pdo');
+   // If pdo_sqlite is static, and sqlite3 is also static, then we don't 
add a second copy of the sqlite3 libs
+   if (PHP_PDO_SQLITE_SHARED || PHP_SQLITE3_SHARED || PHP_SQLITE3 == 'no') 
{
+   ADD_SOURCES(configure_module_dirname + "/../sqlite3/libsqlite", 
"sqlite3.c", "pdo_sqlite");
+   }
 }
 
 ARG_WITH("pdo-sqlite-external", "for pdo_sqlite support from an external dll", 
"no");
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/config.w32?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/sqlite3/config.w32
diff -u php-src/ext/sqlite3/config.w32:1.1.2.1 
php-src/ext/sqlite3/config.w32:1.1.2.2
--- php-src/ext/sqlite3/config.w32:1.1.2.1  Fri Jul 25 02:44:57 2008
+++ php-src/ext/sqlite3/config.w32  Tue Aug  5 20:16:21 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $
+// $Id: config.w32,v 1.1.2.2 2008/08/05 20:16:21 auroraeosrose Exp $
 // vim:ft=javascript
 
 ARG_WITH("sqlite3", "SQLite 3 support", "no");
@@ -10,8 +10,4 @@
ADD_SOURCES(configure_module_dirname + "/libsqlite", "sqlite3.c", 
"sqlite3");
 
AC_DEFINE("HAVE_SQLITE3", 1, "SQLite support");
-
-   if (!PHP_SQLITE3_SHARED) {
-   ADD_DEF_FILE(configure_module_dirname + "\\php_sqlite3.def");
-   }
 }



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

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

2008-07-28 Thread Elizabeth Marie Smith 
auroraeosrose   Mon Jul 28 16:48:38 2008 UTC

  Modified files:  
/php-src/ext/standard   php_crypt_r.c 
  Log:
  Secure versions of string functions don't exist for VC6
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_crypt_r.c?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/php_crypt_r.c
diff -u php-src/ext/standard/php_crypt_r.c:1.1 
php-src/ext/standard/php_crypt_r.c:1.2
--- php-src/ext/standard/php_crypt_r.c:1.1  Mon Jul 28 11:34:53 2008
+++ php-src/ext/standard/php_crypt_r.c  Mon Jul 28 16:48:38 2008
@@ -1,4 +1,4 @@
-/* $Id: php_crypt_r.c,v 1.1 2008/07/28 11:34:53 pajoye Exp $ */
+/* $Id: php_crypt_r.c,v 1.2 2008/07/28 16:48:38 auroraeosrose Exp $ */
 /*
+--+
| PHP Version 5|
@@ -204,10 +204,18 @@
 
memcpy(passwd, MD5_MAGIC, MD5_MAGIC_LEN);
 
-   if (strncpy_s(passwd + MD5_MAGIC_LEN, MD5_HASH_MAX_LEN - MD5_MAGIC_LEN, 
sp, sl + 1) != 0) {
+#ifdef strncpy_s
+   if (strncpy_s(passwd + MD5_MAGIC_LEN, MD5_HASH_MAX_LEN - MD5_MAGIC_LEN, 
sp, sl + 1) != 0) {
+   goto _destroyCtx1;
+   }
+   strcat_s(passwd, MD5_HASH_MAX_LEN, "$");
+#else
+   /* VC6 version doesn't have strcat_s or strncpy_s */
+   if (strncpy(passwd + MD5_MAGIC_LEN, sp, sl + 1) != 0) {
goto _destroyCtx1;
}
-   strcat_s(passwd, MD5_HASH_MAX_LEN, "$");
+   strcat(passwd, "$");
+#endif
 
dwHashLen = 16;
 



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard php_crypt_r.c

2008-07-28 Thread Elizabeth Marie Smith 
auroraeosrose   Mon Jul 28 16:43:51 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   php_crypt_r.c 
  Log:
  Secure versions of string functions don't exist for VC6
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_crypt_r.c?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/php_crypt_r.c
diff -u php-src/ext/standard/php_crypt_r.c:1.1.2.2 
php-src/ext/standard/php_crypt_r.c:1.1.2.3
--- php-src/ext/standard/php_crypt_r.c:1.1.2.2  Mon Jul 28 11:50:34 2008
+++ php-src/ext/standard/php_crypt_r.c  Mon Jul 28 16:43:51 2008
@@ -1,4 +1,4 @@
-/* $Id: php_crypt_r.c,v 1.1.2.2 2008/07/28 11:50:34 pajoye Exp $ */
+/* $Id: php_crypt_r.c,v 1.1.2.3 2008/07/28 16:43:51 auroraeosrose Exp $ */
 /*
+--+
| PHP Version 5|
@@ -204,11 +204,18 @@
 
memcpy(passwd, MD5_MAGIC, MD5_MAGIC_LEN);
 
+#ifdef strncpy_s
if (strncpy_s(passwd + MD5_MAGIC_LEN, MD5_HASH_MAX_LEN - MD5_MAGIC_LEN, 
sp, sl + 1) != 0) {
goto _destroyCtx1;
}
strcat_s(passwd, MD5_HASH_MAX_LEN, "$");
-
+#else
+   /* VC6 version doesn't have strcat_s or strncpy_s */
+   if (strncpy(passwd + MD5_MAGIC_LEN, sp, sl + 1) != 0) {
+   goto _destroyCtx1;
+   }
+   strcat(passwd, "$");
+#endif
dwHashLen = 16;
 
/* Fetch the ctx hash value */



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

[PHP-CVS] cvs: php-src /ext/ereg config.w32 /ext/libxml config.w32 /ext/mysqlnd config.w32 /ext/zlib config.w32 /sapi/apache2filter config.w32 /sapi/apache2handler config.w32 /sapi/isapi config.

2008-05-13 Thread Elizabeth Marie Smith 
auroraeosrose   Wed May 14 03:32:27 2008 UTC

  Modified files:  
/php-src/ext/ereg   config.w32 
/php-src/ext/libxml config.w32 
/php-src/ext/mysqlndconfig.w32 
/php-src/ext/zlib   config.w32 
/php-src/sapi/apache2filter config.w32 
/php-src/sapi/apache2handlerconfig.w32 
/php-src/sapi/isapi config.w32 
/php-src/win32/buildconfutils.js 
  Log:
  MFB and steph's pecl fixes into confutils
  http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/config.w32?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/ereg/config.w32
diff -u php-src/ext/ereg/config.w32:1.2 php-src/ext/ereg/config.w32:1.3
--- php-src/ext/ereg/config.w32:1.2 Mon Jul 16 13:51:41 2007
+++ php-src/ext/ereg/config.w32 Wed May 14 03:32:27 2008
@@ -1,7 +1,11 @@
-// $Id: config.w32,v 1.2 2007/07/16 13:51:41 jani Exp $
+// $Id: config.w32,v 1.3 2008/05/14 03:32:27 auroraeosrose Exp $
 // vim:ft=javascript
 
-EXTENSION("ereg", "ereg.c", false /* never shared */, "-Dregexec=php_regexec 
-Dregerror=php_regerror -Dregfree=php_regfree -Dregcomp=php_regcomp 
-Iext/ereg/regex");
-ADD_SOURCES("ext/ereg/regex", "regcomp.c regexec.c regerror.c regfree.c", 
"ereg");
-AC_DEFINE('REGEX', 1, 'Bundled regex');
-AC_DEFINE('HSREGEX', 1, 'Bundled regex');
+ARG_WITH("ereg", "POSIX extended regular expressions", "yes");
+if (PHP_EREG != "no") {
+
+   EXTENSION("ereg", "ereg.c", false /* never shared */, 
"-Dregexec=php_regexec -Dregerror=php_regerror -Dregfree=php_regfree 
-Dregcomp=php_regcomp -Iext/ereg/regex");
+   ADD_SOURCES("ext/ereg/regex", "regcomp.c regexec.c regerror.c 
regfree.c", "ereg");
+   AC_DEFINE('REGEX', 1, 'Bundled regex');
+   AC_DEFINE('HSREGEX', 1, 'Bundled regex');
+}
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/config.w32?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/libxml/config.w32
diff -u php-src/ext/libxml/config.w32:1.9 php-src/ext/libxml/config.w32:1.10
--- php-src/ext/libxml/config.w32:1.9   Tue Dec  4 17:14:02 2007
+++ php-src/ext/libxml/config.w32   Wed May 14 03:32:27 2008
@@ -1,11 +1,11 @@
-// $Id: config.w32,v 1.9 2007/12/04 17:14:02 rrichards Exp $
+// $Id: config.w32,v 1.10 2008/05/14 03:32:27 auroraeosrose Exp $
 // vim:ft=javascript
 
 ARG_WITH("libxml", "LibXML support", "yes");
 
 if (PHP_LIBXML == "yes") {
if (CHECK_LIB("libxml2_a_dll.lib;libxml2_a.lib", "libxml") &&
-   CHECK_LIB("iconv_a.lib;iconv.lib", "libxml") &&
+   
CHECK_LIB("libiconv_a.lib;iconv_a.lib;libiconv.lib;iconv.lib", "libxml") &&
CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS")) {
 
EXTENSION("libxml", "libxml.c", false /* never shared */);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config.w32?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/mysqlnd/config.w32
diff -u php-src/ext/mysqlnd/config.w32:1.9 php-src/ext/mysqlnd/config.w32:1.10
--- php-src/ext/mysqlnd/config.w32:1.9  Tue Jan 29 12:25:38 2008
+++ php-src/ext/mysqlnd/config.w32  Wed May 14 03:32:27 2008
@@ -1,21 +1,25 @@
-// $Id: config.w32,v 1.9 2008/01/29 12:25:38 dmitry Exp $
+// $Id: config.w32,v 1.10 2008/05/14 03:32:27 auroraeosrose Exp $
 // vim:ft=javascript
 
-if (CHECK_LIB("ws2_32.lib", "mysqlnd")) {
-   mysqlnd_source = 
-   "mysqlnd.c " +
-   "mysqlnd_block_alloc.c " +
-   "mysqlnd_charset.c " +
-   "mysqlnd_debug.c " +
-   "mysqlnd_loaddata.c " +
-   "mysqlnd_palloc.c " +
-   "mysqlnd_ps.c " +
-   "mysqlnd_ps_codec.c " +
-   "mysqlnd_qcache.c " +
-   "mysqlnd_result.c " +
-   "mysqlnd_result_meta.c " +
-   "mysqlnd_statistics.c " +
-   "mysqlnd_wireprotocol.c " +
-   "php_mysqlnd.c";
-   EXTENSION("mysqlnd", mysqlnd_source, false);
-}
+ARG_WITH("mysqlnd", "Mysql Native Client Driver", "yes");
+if (PHP_MYSQLND != "no") {
+
+   if (CHECK_LIB("ws2_32.lib", "mysqlnd")) {
+   mysqlnd_source = 
+   "mysqlnd.c " +
+   "mysqlnd_block_alloc.c " +
+   "mysqlnd_charset.c " +
+   "mysqlnd_debug.c " +
+   "mysqlnd_loaddata.c " +
+   "mysqlnd_palloc.c " +
+   "mysqlnd_ps.c " +
+   "mysqlnd_ps_codec.c " +
+   "mysqlnd_qcache.c " +
+   "mysqlnd_result.c " +
+   "mysqlnd_result_meta.c " +
+   "mysqlnd_statistics.c " +
+   "mysqlnd_wireprotocol.c " +
+   "php_mysqlnd.c";
+   EXTENSION("mysqlnd", mysqlnd_source, false);
+   }
+}
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/config.w32?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/zlib/config.w32
diff -u php-src/ext/zlib/con

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/ereg config.w32 /ext/libxml config.w32 /ext/mysqlnd config.w32 /ext/zlib config.w32 /sapi/apache2filter config.w32 /sapi/apache2handler config.w32 /sapi/isap

2008-05-13 Thread Elizabeth Marie Smith 
auroraeosrose   Wed May 14 03:13:17 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/ereg   config.w32 
/php-src/ext/libxml config.w32 
/php-src/ext/mysqlndconfig.w32 
/php-src/ext/zlib   config.w32 
/php-src/sapi/apache2filter config.w32 
/php-src/sapi/apache2handlerconfig.w32 
/php-src/sapi/isapi config.w32 
/php-src/win32/buildconfutils.js 
  Log:
  Windows configure fixes, a few additional lib names allowed, apache2 only on 
for zts builds since apache on win is always threaded, isapi no longer stops 
configure in non-zts mode, look for _debug for debug libraries when debug is 
enabled
  http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/config.w32?r1=1.2.2.2&r2=1.2.2.3&diff_format=u
Index: php-src/ext/ereg/config.w32
diff -u php-src/ext/ereg/config.w32:1.2.2.2 php-src/ext/ereg/config.w32:1.2.2.3
--- php-src/ext/ereg/config.w32:1.2.2.2 Fri Oct  5 15:00:05 2007
+++ php-src/ext/ereg/config.w32 Wed May 14 03:13:16 2008
@@ -1,7 +1,11 @@
-// $Id: config.w32,v 1.2.2.2 2007/10/05 15:00:05 jani Exp $
+// $Id: config.w32,v 1.2.2.3 2008/05/14 03:13:16 auroraeosrose Exp $
 // vim:ft=javascript
 
-EXTENSION("ereg", "ereg.c", false /* never shared */, "-Dregexec=php_regexec 
-Dregerror=php_regerror -Dregfree=php_regfree -Dregcomp=php_regcomp 
-Iext/ereg/regex");
-ADD_SOURCES("ext/ereg/regex", "regcomp.c regexec.c regerror.c regfree.c", 
"ereg");
-AC_DEFINE('REGEX', 1, 'Bundled regex');
-AC_DEFINE('HSREGEX', 1, 'Bundled regex');
+ARG_WITH("ereg", "POSIX extended regular expressions", "yes");
+if (PHP_EREG != "no") {
+
+   EXTENSION("ereg", "ereg.c", false /* never shared */, 
"-Dregexec=php_regexec -Dregerror=php_regerror -Dregfree=php_regfree 
-Dregcomp=php_regcomp -Iext/ereg/regex");
+   ADD_SOURCES("ext/ereg/regex", "regcomp.c regexec.c regerror.c 
regfree.c", "ereg");
+   AC_DEFINE('REGEX', 1, 'Bundled regex');
+   AC_DEFINE('HSREGEX', 1, 'Bundled regex');
+}
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/config.w32?r1=1.8.6.1&r2=1.8.6.2&diff_format=u
Index: php-src/ext/libxml/config.w32
diff -u php-src/ext/libxml/config.w32:1.8.6.1 
php-src/ext/libxml/config.w32:1.8.6.2
--- php-src/ext/libxml/config.w32:1.8.6.1   Tue Dec  4 17:14:34 2007
+++ php-src/ext/libxml/config.w32   Wed May 14 03:13:17 2008
@@ -1,11 +1,11 @@
-// $Id: config.w32,v 1.8.6.1 2007/12/04 17:14:34 rrichards Exp $
+// $Id: config.w32,v 1.8.6.2 2008/05/14 03:13:17 auroraeosrose Exp $
 // vim:ft=javascript
 
 ARG_WITH("libxml", "LibXML support", "yes");
 
 if (PHP_LIBXML == "yes") {
if (CHECK_LIB("libxml2_a_dll.lib;libxml2_a.lib", "libxml") &&
-   CHECK_LIB("iconv_a.lib;iconv.lib", "libxml") &&
+   
CHECK_LIB("libiconv_a.lib;iconv_a.lib;libiconv.lib;iconv.lib", "libxml") &&
CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS")) {
 
EXTENSION("libxml", "libxml.c", false /* never shared */);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config.w32?r1=1.4.2.6&r2=1.4.2.7&diff_format=u
Index: php-src/ext/mysqlnd/config.w32
diff -u php-src/ext/mysqlnd/config.w32:1.4.2.6 
php-src/ext/mysqlnd/config.w32:1.4.2.7
--- php-src/ext/mysqlnd/config.w32:1.4.2.6  Tue Jan 29 12:25:25 2008
+++ php-src/ext/mysqlnd/config.w32  Wed May 14 03:13:17 2008
@@ -1,21 +1,25 @@
-// $Id: config.w32,v 1.4.2.6 2008/01/29 12:25:25 dmitry Exp $
+// $Id: config.w32,v 1.4.2.7 2008/05/14 03:13:17 auroraeosrose Exp $
 // vim:ft=javascript
 
-if (CHECK_LIB("ws2_32.lib", "mysqlnd")) {
-   mysqlnd_source = 
-   "mysqlnd.c " +
-   "mysqlnd_block_alloc.c " +
-   "mysqlnd_charset.c " +
-   "mysqlnd_debug.c " +
-   "mysqlnd_loaddata.c " +
-   "mysqlnd_palloc.c " +
-   "mysqlnd_ps.c " +
-   "mysqlnd_ps_codec.c " +
-   "mysqlnd_qcache.c " +
-   "mysqlnd_result.c " +
-   "mysqlnd_result_meta.c " +
-   "mysqlnd_statistics.c " +
-   "mysqlnd_wireprotocol.c " +
-   "php_mysqlnd.c";
-   EXTENSION("mysqlnd", mysqlnd_source, false);
-}
+ARG_WITH("mysqlnd", "Mysql Native Client Driver", "yes");
+if (PHP_MYSQLND != "no") {
+
+   if (CHECK_LIB("ws2_32.lib", "mysqlnd")) {
+   mysqlnd_source = 
+   "mysqlnd.c " +
+   "mysqlnd_block_alloc.c " +
+   "mysqlnd_charset.c " +
+   "mysqlnd_debug.c " +
+   "mysqlnd_loaddata.c " +
+   "mysqlnd_palloc.c " +
+   "mysqlnd_ps.c " +
+   "mysqlnd_ps_codec.c " +
+   "mysqlnd_qcache.c " +
+   "mysqlnd_result.c " +
+   "mysqlnd_result_meta.c " +
+   "mysqlnd_statistics.c " +
+   "mysqlnd_wireprotoc

[PHP-CVS] cvs: php-src /ext/pcre config.w32 /ext/reflection config.w32 /ext/spl config.w32

2008-05-02 Thread Elizabeth Marie Smith 
auroraeosrose   Fri May  2 14:10:05 2008 UTC

  Modified files:  
/php-src/ext/pcre   config.w32 
/php-src/ext/reflection config.w32 
/php-src/ext/splconfig.w32 
  Log:
  MFB
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/config.w32?r1=1.15&r2=1.16&diff_format=u
Index: php-src/ext/pcre/config.w32
diff -u php-src/ext/pcre/config.w32:1.15 php-src/ext/pcre/config.w32:1.16
--- php-src/ext/pcre/config.w32:1.15Tue Sep 11 16:19:14 2007
+++ php-src/ext/pcre/config.w32 Fri May  2 14:10:05 2008
@@ -1,14 +1,11 @@
-// $Id: config.w32,v 1.15 2007/09/11 16:19:14 nlopess Exp $
+// $Id: config.w32,v 1.16 2008/05/02 14:10:05 auroraeosrose Exp $
 // vim:ft=javascript
 
-ARG_WITH("pcre-regex", "Perl Compatible Regular Expressions", "yes");
 
-if (PHP_PCRE_REGEX == "yes") {
-   EXTENSION("pcre", "php_pcre.c", PHP_PCRE_REGEX_SHARED,
-   "-DNO_RECURSE -Iext/pcre/pcrelib");
-   ADD_SOURCES("ext/pcre/pcrelib", "pcre_chartables.c 
pcre_ucp_searchfuncs.c pcre_compile.c pcre_config.c pcre_exec.c pcre_fullinfo.c 
pcre_get.c pcre_globals.c pcre_info.c pcre_maketables.c pcre_newline.c 
pcre_ord2utf8.c pcre_refcount.c pcre_study.c pcre_tables.c pcre_try_flipped.c 
pcre_valid_utf8.c pcre_version.c pcre_xclass.c", "pcre");
-   ADD_DEF_FILE("ext\\pcre\\php_pcre.def");
+EXTENSION("pcre", "php_pcre.c", false /* never shared */,
+   "-DNO_RECURSE -Iext/pcre/pcrelib");
+ADD_SOURCES("ext/pcre/pcrelib", "pcre_chartables.c pcre_ucp_searchfuncs.c 
pcre_compile.c pcre_config.c pcre_exec.c pcre_fullinfo.c pcre_get.c 
pcre_globals.c pcre_info.c pcre_maketables.c pcre_newline.c pcre_ord2utf8.c 
pcre_refcount.c pcre_study.c pcre_tables.c pcre_try_flipped.c pcre_valid_utf8.c 
pcre_version.c pcre_xclass.c", "pcre");
+ADD_DEF_FILE("ext\\pcre\\php_pcre.def");
 
-   AC_DEFINE('HAVE_BUNDLED_PCRE', 1, 'Using bundled PCRE library');
-   AC_DEFINE('HAVE_PCRE', 1, 'Have PCRE library');
-}
+AC_DEFINE('HAVE_BUNDLED_PCRE', 1, 'Using bundled PCRE library');
+AC_DEFINE('HAVE_PCRE', 1, 'Have PCRE library');
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/config.w32?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/reflection/config.w32
diff -u php-src/ext/reflection/config.w32:1.4 
php-src/ext/reflection/config.w32:1.5
--- php-src/ext/reflection/config.w32:1.4   Fri May  2 13:12:02 2008
+++ php-src/ext/reflection/config.w32   Fri May  2 14:10:05 2008
@@ -1,5 +1,5 @@
-// $Id: config.w32,v 1.4 2008/05/02 13:12:02 lstrojny Exp $
+// $Id: config.w32,v 1.5 2008/05/02 14:10:05 auroraeosrose Exp $
 // vim:ft=javascript
 
-EXTENSION("reflection", "php_reflection.c");
+EXTENSION("reflection", "php_reflection.c", false /* never shared */);
 AC_DEFINE('HAVE_REFLECTION', 1, 'Reflection support enabled');
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/config.w32?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/spl/config.w32
diff -u php-src/ext/spl/config.w32:1.9 php-src/ext/spl/config.w32:1.10
--- php-src/ext/spl/config.w32:1.9  Mon Feb 25 23:36:36 2008
+++ php-src/ext/spl/config.w32  Fri May  2 14:10:05 2008
@@ -1,12 +1,5 @@
-// $Id: config.w32,v 1.9 2008/02/25 23:36:36 colder Exp $
+// $Id: config.w32,v 1.10 2008/05/02 14:10:05 auroraeosrose Exp $
 // vim:ft=javascript
 
-ARG_ENABLE("spl", "SPL (Standard PHP Library) support", "yes");
-
-if (PHP_SPL != "no") {
-   if (PHP_SPL_SHARED) {
-   ERROR("SPL cannot be compiled as a shared ext");
-   }
-   EXTENSION("spl", "php_spl.c spl_functions.c spl_engine.c 
spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c 
spl_observer.c spl_dllist.c spl_heap.c");
-   AC_DEFINE('HAVE_SPL', 1);
-}
+EXTENSION("spl", "php_spl.c spl_functions.c spl_engine.c spl_iterators.c 
spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c spl_observer.c 
spl_dllist.c spl_heap.c", false /* never shared */);
+AC_DEFINE('HAVE_SPL', 1);



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pcre config.w32 /ext/reflection config.w32 /ext/spl config.w32

2008-05-02 Thread Elizabeth Marie Smith 
auroraeosrose   Fri May  2 14:05:53 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pcre   config.w32 
/php-src/ext/reflection config.w32 
/php-src/ext/splconfig.w32 
  Log:
  Fix reflection (always static, never shared) and disable turning off pcre and 
spl (also always static, never shared)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/config.w32?r1=1.4.2.5.2.7&r2=1.4.2.5.2.7.2.1&diff_format=u
Index: php-src/ext/pcre/config.w32
diff -u php-src/ext/pcre/config.w32:1.4.2.5.2.7 
php-src/ext/pcre/config.w32:1.4.2.5.2.7.2.1
--- php-src/ext/pcre/config.w32:1.4.2.5.2.7 Tue Sep 11 16:17:33 2007
+++ php-src/ext/pcre/config.w32 Fri May  2 14:05:52 2008
@@ -1,14 +1,10 @@
-// $Id: config.w32,v 1.4.2.5.2.7 2007/09/11 16:17:33 nlopess Exp $
+// $Id: config.w32,v 1.4.2.5.2.7.2.1 2008/05/02 14:05:52 auroraeosrose Exp $
 // vim:ft=javascript
 
-ARG_WITH("pcre-regex", "Perl Compatible Regular Expressions", "yes");
-
-if (PHP_PCRE_REGEX == "yes") {
-   EXTENSION("pcre", "php_pcre.c", PHP_PCRE_REGEX_SHARED,
+EXTENSION("pcre", "php_pcre.c", false /* never shared */,
"-DNO_RECURSE -Iext/pcre/pcrelib");
ADD_SOURCES("ext/pcre/pcrelib", "pcre_chartables.c 
pcre_ucp_searchfuncs.c pcre_compile.c pcre_config.c pcre_exec.c pcre_fullinfo.c 
pcre_get.c pcre_globals.c pcre_info.c pcre_maketables.c pcre_newline.c 
pcre_ord2utf8.c pcre_refcount.c pcre_study.c pcre_tables.c pcre_try_flipped.c 
pcre_valid_utf8.c pcre_version.c pcre_xclass.c", "pcre");
ADD_DEF_FILE("ext\\pcre\\php_pcre.def");
 
AC_DEFINE('HAVE_BUNDLED_PCRE', 1, 'Using bundled PCRE library');
AC_DEFINE('HAVE_PCRE', 1, 'Have PCRE library');
-}
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/config.w32?r1=1.2.2.2.2.1.2.1&r2=1.2.2.2.2.1.2.2&diff_format=u
Index: php-src/ext/reflection/config.w32
diff -u php-src/ext/reflection/config.w32:1.2.2.2.2.1.2.1 
php-src/ext/reflection/config.w32:1.2.2.2.2.1.2.2
--- php-src/ext/reflection/config.w32:1.2.2.2.2.1.2.1   Fri May  2 13:11:45 2008
+++ php-src/ext/reflection/config.w32   Fri May  2 14:05:53 2008
@@ -1,5 +1,5 @@
-// $Id: config.w32,v 1.2.2.2.2.1.2.1 2008/05/02 13:11:45 lstrojny Exp $
+// $Id: config.w32,v 1.2.2.2.2.1.2.2 2008/05/02 14:05:53 auroraeosrose Exp $
 // vim:ft=javascript
 
-EXTENSION("reflection", "php_reflection.c");
+EXTENSION("reflection", "php_reflection.c", false /* never shared */);
 AC_DEFINE('HAVE_REFLECTION', 1, 'Reflection support enabled');
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/config.w32?r1=1.7.6.2&r2=1.7.6.3&diff_format=u
Index: php-src/ext/spl/config.w32
diff -u php-src/ext/spl/config.w32:1.7.6.2 php-src/ext/spl/config.w32:1.7.6.3
--- php-src/ext/spl/config.w32:1.7.6.2  Mon Feb 25 23:39:08 2008
+++ php-src/ext/spl/config.w32  Fri May  2 14:05:53 2008
@@ -1,12 +1,6 @@
-// $Id: config.w32,v 1.7.6.2 2008/02/25 23:39:08 colder Exp $
+// $Id: config.w32,v 1.7.6.3 2008/05/02 14:05:53 auroraeosrose Exp $
 // vim:ft=javascript
 
-ARG_ENABLE("spl", "SPL (Standard PHP Library) support", "yes");
-
-if (PHP_SPL != "no") {
-   if (PHP_SPL_SHARED) {
-   ERROR("SPL cannot be compiled as a shared ext");
-   }
-   EXTENSION("spl", "php_spl.c spl_functions.c spl_engine.c 
spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c 
spl_observer.c spl_dllist.c spl_heap.c");
+   EXTENSION("spl", "php_spl.c spl_functions.c spl_engine.c 
spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c 
spl_observer.c spl_dllist.c spl_heap.c", false /*never shared */);
AC_DEFINE('HAVE_SPL', 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 config.w32 /sapi/apache_hooks config.w32

2008-04-15 Thread Elizabeth Marie Smith 
auroraeosrose   Tue Apr 15 16:59:40 2008 UTC

  Modified files:  
/php-src/sapi/apacheconfig.w32 
/php-src/sapi/apache_hooks  config.w32 
  Log:
  MFB
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/config.w32?r1=1.8&r2=1.9&diff_format=u
Index: php-src/sapi/apache/config.w32
diff -u php-src/sapi/apache/config.w32:1.8 php-src/sapi/apache/config.w32:1.9
--- php-src/sapi/apache/config.w32:1.8  Mon Jul 16 19:02:43 2007
+++ php-src/sapi/apache/config.w32  Tue Apr 15 16:59:40 2008
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.8 2007/07/16 19:02:43 tony2001 Exp $
+// $Id: config.w32,v 1.9 2008/04/15 16:59:40 auroraeosrose Exp $
 
 ARG_ENABLE('apache', 'Build Apache 1.3.x version of PHP', 'no');
 
@@ -9,10 +9,10 @@
 if (PHP_APACHE != "no") {
if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE", 
php_usual_include_suspects +
";" + PROGRAM_FILES + "\\Apache 
Group\\Apache\\include" +
-   ";..\\php_build\\apache\\src\\include") &&
+   ";" + PHP_PHP_BUILD + "\\apache\\src\\include") 
&&
CHECK_LIB("ApacheCore.lib", "apache", 
php_usual_lib_suspects +
';' + PROGRAM_FILES + '\\Apache 
Group\\Apache\\libexec' +
-   ';..\\php_build\\apache\\src\\corer')) {
+   ";" + PHP_PHP_BUILD + "\\apache\\src\\corer")) {
// We need to play tricks to get our readdir.h used by apache
// headers
SAPI('apache', 'mod_php.c sapi_apache.c php_apache.c',
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/config.w32?r1=1.2&r2=1.3&diff_format=u
Index: php-src/sapi/apache_hooks/config.w32
diff -u php-src/sapi/apache_hooks/config.w32:1.2 
php-src/sapi/apache_hooks/config.w32:1.3
--- php-src/sapi/apache_hooks/config.w32:1.2Sat Jan 17 13:00:08 2004
+++ php-src/sapi/apache_hooks/config.w32Tue Apr 15 16:59:40 2008
@@ -1,15 +1,15 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.2 2004/01/17 13:00:08 sniper Exp $
+// $Id: config.w32,v 1.3 2008/04/15 16:59:40 auroraeosrose Exp $
 
 ARG_WITH('apache-hooks', 'Build Apache 1.3.x (hooks) version of PHP', 'no');
 
 if (PHP_APACHE_HOOKS != "no") {
if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE_HOOKS", 
php_usual_include_suspects +
";" + PROGRAM_FILES + "\\Apache 
Group\\Apache\\include" +
-   ";..\\php_build\\apache\\src\\include") &&
+   ";" + PHP_PHP_BUILD + "\\apache\\src\\include") 
&&
CHECK_LIB("ApacheCore.lib", "apache_hooks", 
php_usual_lib_suspects +
';' + PROGRAM_FILES + '\\Apache 
Group\\Apache\\libexec' +
-   ';..\\php_build\\apache\\src\\corer')) {
+   ";" + PHP_PHP_BUILD + "\\apache\\src\\corer")) {
// We need to play tricks to get our readdir.h used by apache
// headers
SAPI('apache_hooks', 'mod_php5.c sapi_apache.c php_apache.c',



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

[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/apache config.w32 /sapi/apache_hooks config.w32

2008-04-15 Thread Elizabeth Marie Smith 
auroraeosrose   Tue Apr 15 16:55:54 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/sapi/apacheconfig.w32 
/php-src/sapi/apache_hooks  config.w32 
  Log:
  These are really old config.w32 files - now they use PHP_PHP_BUILD correctly 
instead of hard coding the path to the libraries
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/config.w32?r1=1.7&r2=1.7.8.1&diff_format=u
Index: php-src/sapi/apache/config.w32
diff -u php-src/sapi/apache/config.w32:1.7 
php-src/sapi/apache/config.w32:1.7.8.1
--- php-src/sapi/apache/config.w32:1.7  Sat Jan 17 13:00:04 2004
+++ php-src/sapi/apache/config.w32  Tue Apr 15 16:55:53 2008
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.7 2004/01/17 13:00:04 sniper Exp $
+// $Id: config.w32,v 1.7.8.1 2008/04/15 16:55:53 auroraeosrose Exp $
 
 ARG_ENABLE('apache', 'Build Apache 1.3.x version of PHP', 'no');
 
@@ -9,10 +9,10 @@
 if (PHP_APACHE != "no") {
if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE", 
php_usual_include_suspects +
";" + PROGRAM_FILES + "\\Apache 
Group\\Apache\\include" +
-   ";..\\php_build\\apache\\src\\include") &&
+   ";" + PHP_PHP_BUILD + "\\apache\\src\\include") 
&&
CHECK_LIB("ApacheCore.lib", "apache", 
php_usual_lib_suspects +
';' + PROGRAM_FILES + '\\Apache 
Group\\Apache\\libexec' +
-   ';..\\php_build\\apache\\src\\corer')) {
+   ";" + PHP_PHP_BUILD + "\\apache\\src\\corer")) {
// We need to play tricks to get our readdir.h used by apache
// headers
SAPI('apache', 'mod_php5.c sapi_apache.c php_apache.c',
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/config.w32?r1=1.2&r2=1.2.8.1&diff_format=u
Index: php-src/sapi/apache_hooks/config.w32
diff -u php-src/sapi/apache_hooks/config.w32:1.2 
php-src/sapi/apache_hooks/config.w32:1.2.8.1
--- php-src/sapi/apache_hooks/config.w32:1.2Sat Jan 17 13:00:08 2004
+++ php-src/sapi/apache_hooks/config.w32Tue Apr 15 16:55:53 2008
@@ -1,15 +1,15 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.2 2004/01/17 13:00:08 sniper Exp $
+// $Id: config.w32,v 1.2.8.1 2008/04/15 16:55:53 auroraeosrose Exp $
 
 ARG_WITH('apache-hooks', 'Build Apache 1.3.x (hooks) version of PHP', 'no');
 
 if (PHP_APACHE_HOOKS != "no") {
if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE_HOOKS", 
php_usual_include_suspects +
";" + PROGRAM_FILES + "\\Apache 
Group\\Apache\\include" +
-   ";..\\php_build\\apache\\src\\include") &&
+   ";" + PHP_PHP_BUILD + "\\apache\\src\\include") 
&&
CHECK_LIB("ApacheCore.lib", "apache_hooks", 
php_usual_lib_suspects +
';' + PROGRAM_FILES + '\\Apache 
Group\\Apache\\libexec' +
-   ';..\\php_build\\apache\\src\\corer')) {
+   ";" + PHP_PHP_BUILD + "\\apache\\src\\corer")) {
// We need to play tricks to get our readdir.h used by apache
// headers
SAPI('apache_hooks', 'mod_php5.c sapi_apache.c php_apache.c',



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

[PHP-CVS] cvs: php-src(PHP_5_3) / .cvsignore

2008-03-18 Thread Elizabeth Marie Smith 
auroraeosrose   Tue Mar 18 22:48:26 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src.cvsignore 
  Log:
  Correct name for the file
  
http://cvs.php.net/viewvc.cgi/php-src/.cvsignore?r1=1.51.4.2.2.1&r2=1.51.4.2.2.2&diff_format=u
Index: php-src/.cvsignore
diff -u php-src/.cvsignore:1.51.4.2.2.1 php-src/.cvsignore:1.51.4.2.2.2
--- php-src/.cvsignore:1.51.4.2.2.1 Tue Mar 18 18:00:40 2008
+++ php-src/.cvsignore  Tue Mar 18 22:48:26 2008
@@ -62,7 +62,7 @@
 confdefs.h
 configure.js
 config.nice.bat
-config.bat
+configure.bat
 ZendEngine1
 php_test_results_*.txt
 *.gcda



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

[PHP-CVS] cvs: php-src(PHP_5_3) / .cvsignore

2008-03-18 Thread Elizabeth Marie Smith 
auroraeosrose   Tue Mar 18 18:00:40 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src.cvsignore 
  Log:
  Ignore steph's pretty batch file
  
http://cvs.php.net/viewvc.cgi/php-src/.cvsignore?r1=1.51.4.2&r2=1.51.4.2.2.1&diff_format=u
Index: php-src/.cvsignore
diff -u php-src/.cvsignore:1.51.4.2 php-src/.cvsignore:1.51.4.2.2.1
--- php-src/.cvsignore:1.51.4.2 Tue Jun 12 14:54:14 2007
+++ php-src/.cvsignore  Tue Mar 18 18:00:40 2008
@@ -62,6 +62,7 @@
 confdefs.h
 configure.js
 config.nice.bat
+config.bat
 ZendEngine1
 php_test_results_*.txt
 *.gcda



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_directory.c

2008-01-30 Thread Elizabeth Marie Smith 
auroraeosrose   Thu Jan 31 02:35:44 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/splspl_directory.c 
  Log:
  Fix windows build
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.27.2.23.2.10&r2=1.45.2.27.2.23.2.11&diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.10 
php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.11
--- php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.10 Wed Jan 30 23:45:12 2008
+++ php-src/ext/spl/spl_directory.c Thu Jan 31 02:35:44 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.10 2008/01/30 23:45:12 helly Exp $ 
*/
+/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.11 2008/01/31 02:35:44 
auroraeosrose Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -194,7 +194,7 @@
 
if (intern->_path_len && (path[intern->_path_len-1] == '/'
 #if defined(PHP_WIN32) || defined(NETWARE)
-   || path[intern->path_len-1] == '\\'
+   || path[intern->_path_len-1] == '\\'
 #endif
)) {
intern->_path = estrndup(path, --intern->_path_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) /win32/build confutils.js

2007-11-14 Thread Elizabeth Marie Smith 
auroraeosrose   Wed Nov 14 19:48:57 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/win32/buildconfutils.js 
  Log:
  MFB
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8&r2=1.60.2.1.2.9&diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8 
php-src/win32/build/confutils.js:1.60.2.1.2.9
--- php-src/win32/build/confutils.js:1.60.2.1.2.8   Thu Jul 26 22:45:59 2007
+++ php-src/win32/build/confutils.jsWed Nov 14 19:48:57 2007
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8 2007/07/26 22:45:59 jani Exp $
+// $Id: confutils.js,v 1.60.2.1.2.9 2007/11/14 19:48:57 auroraeosrose Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -429,7 +429,7 @@
 
STDOUT.WriteLine("Saving configure options to config.nice.bat");
var nicefile = FSO.CreateTextFile("config.nice.bat", true);
-   nicefile.WriteLine(nice);
+   nicefile.WriteLine(nice +  " %*");
nicefile.Close();
 
AC_DEFINE('CONFIGURE_COMMAND', nice);

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

[PHP-CVS] cvs: php-src /win32/build confutils.js

2007-11-14 Thread Elizabeth Marie Smith 
auroraeosrose   Wed Nov 14 19:44:24 2007 UTC

  Modified files:  
/php-src/win32/buildconfutils.js 
  Log:
  MFB
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.69&r2=1.70&diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.69 
php-src/win32/build/confutils.js:1.70
--- php-src/win32/build/confutils.js:1.69   Thu Jul 26 22:45:22 2007
+++ php-src/win32/build/confutils.jsWed Nov 14 19:44:24 2007
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.69 2007/07/26 22:45:22 jani Exp $
+// $Id: confutils.js,v 1.70 2007/11/14 19:44:24 auroraeosrose Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -429,7 +429,7 @@
 
STDOUT.WriteLine("Saving configure options to config.nice.bat");
var nicefile = FSO.CreateTextFile("config.nice.bat", true);
-   nicefile.WriteLine(nice);
+   nicefile.WriteLine(nice +  " %*");
nicefile.Close();
 
AC_DEFINE('CONFIGURE_COMMAND', nice);

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

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js

2007-11-14 Thread Elizabeth Marie Smith 
auroraeosrose   Wed Nov 14 19:38:57 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js 
  Log:
  Allow passing additional configuration parameters to config.nice.bat
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8&r2=1.60.2.1.2.8.2.1&diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.1
--- php-src/win32/build/confutils.js:1.60.2.1.2.8   Thu Jul 26 22:45:59 2007
+++ php-src/win32/build/confutils.jsWed Nov 14 19:38:57 2007
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8 2007/07/26 22:45:59 jani Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.1 2007/11/14 19:38:57 auroraeosrose Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -429,7 +429,7 @@
 
STDOUT.WriteLine("Saving configure options to config.nice.bat");
var nicefile = FSO.CreateTextFile("config.nice.bat", true);
-   nicefile.WriteLine(nice);
+   nicefile.WriteLine(nice +  " %*");
nicefile.Close();
 
AC_DEFINE('CONFIGURE_COMMAND', nice);

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

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

2007-10-10 Thread Elizabeth Marie Smith 
auroraeosrose   Wed Oct 10 23:23:54 2007 UTC

  Modified files:  
/php-src/main   network.c php_network.h 
  Log:
  MFB
  
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.127&r2=1.128&diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.127 php-src/main/network.c:1.128
--- php-src/main/network.c:1.127Wed Jul 18 09:04:37 2007
+++ php-src/main/network.c  Wed Oct 10 23:23:54 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: network.c,v 1.127 2007/07/18 09:04:37 jani Exp $ */
+/* $Id: network.c,v 1.128 2007/10/10 23:23:54 auroraeosrose Exp $ */
 
 /*#define DEBUG_MAIN_NETWORK 1*/
 
@@ -90,6 +90,9 @@
 # define SOCK_ERR INVALID_SOCKET
 # define SOCK_CONN_ERR SOCKET_ERROR
 # define PHP_TIMEOUT_ERROR_VALUE   WSAETIMEDOUT
+
+struct in6_addr in6addr_any = {0}; /* IN6ADDR_ANY_INIT; */
+
 #else
 # define SOCK_ERR -1
 # define SOCK_CONN_ERR -1
http://cvs.php.net/viewvc.cgi/php-src/main/php_network.h?r1=1.58&r2=1.59&diff_format=u
Index: php-src/main/php_network.h
diff -u php-src/main/php_network.h:1.58 php-src/main/php_network.h:1.59
--- php-src/main/php_network.h:1.58 Mon Jan  1 09:29:35 2007
+++ php-src/main/php_network.h  Wed Oct 10 23:23:54 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_network.h,v 1.58 2007/01/01 09:29:35 sebastian Exp $ */
+/* $Id: php_network.h,v 1.59 2007/10/10 23:23:54 auroraeosrose Exp $ */
 
 #ifndef _PHP_NETWORK_H
 #define _PHP_NETWORK_H
@@ -121,12 +121,14 @@
 
 PHPAPI int php_poll2(php_pollfd *ufds, unsigned int nfds, int timeout);
 
+#ifndef POLLIN
 # define POLLIN  0x0001/* There is data to read */
 # define POLLPRI 0x0002/* There is urgent data to read */
 # define POLLOUT 0x0004/* Writing now will not block */
 # define POLLERR 0x0008/* Error condition */
 # define POLLHUP 0x0010/* Hung up */
 # define POLLNVAL0x0020/* Invalid request: fd not open */
+#endif
 
 # ifndef PHP_USE_POLL_2_EMULATION
 #  define PHP_USE_POLL_2_EMULATION 1

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

[PHP-CVS] cvs: php-src(PHP_5_3) /main network.c php_network.h

2007-10-09 Thread Elizabeth Marie Smith 
auroraeosrose   Tue Oct  9 21:53:44 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/main   network.c php_network.h 
  Log:
  Fix build on MSVC 2008 - channeling Wez
  
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.118.2.2.2.6&r2=1.118.2.2.2.6.2.1&diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.118.2.2.2.6 
php-src/main/network.c:1.118.2.2.2.6.2.1
--- php-src/main/network.c:1.118.2.2.2.6Wed Jul 18 09:04:58 2007
+++ php-src/main/network.c  Tue Oct  9 21:53:44 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: network.c,v 1.118.2.2.2.6 2007/07/18 09:04:58 jani Exp $ */
+/* $Id: network.c,v 1.118.2.2.2.6.2.1 2007/10/09 21:53:44 auroraeosrose Exp $ 
*/
 
 /*#define DEBUG_MAIN_NETWORK 1*/
 
@@ -90,6 +90,9 @@
 # define SOCK_ERR INVALID_SOCKET
 # define SOCK_CONN_ERR SOCKET_ERROR
 # define PHP_TIMEOUT_ERROR_VALUE   WSAETIMEDOUT
+
+struct in6_addr in6addr_any = {0}; /* IN6ADDR_ANY_INIT; */
+
 #else
 # define SOCK_ERR -1
 # define SOCK_CONN_ERR -1
http://cvs.php.net/viewvc.cgi/php-src/main/php_network.h?r1=1.56.2.1.2.1&r2=1.56.2.1.2.1.2.1&diff_format=u
Index: php-src/main/php_network.h
diff -u php-src/main/php_network.h:1.56.2.1.2.1 
php-src/main/php_network.h:1.56.2.1.2.1.2.1
--- php-src/main/php_network.h:1.56.2.1.2.1 Mon Jan  1 09:36:11 2007
+++ php-src/main/php_network.h  Tue Oct  9 21:53:44 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_network.h,v 1.56.2.1.2.1 2007/01/01 09:36:11 sebastian Exp $ */
+/* $Id: php_network.h,v 1.56.2.1.2.1.2.1 2007/10/09 21:53:44 auroraeosrose Exp 
$ */
 
 #ifndef _PHP_NETWORK_H
 #define _PHP_NETWORK_H
@@ -121,12 +121,14 @@
 
 PHPAPI int php_poll2(php_pollfd *ufds, unsigned int nfds, int timeout);
 
+#ifndef POLLIN
 # define POLLIN  0x0001/* There is data to read */
 # define POLLPRI 0x0002/* There is urgent data to read */
 # define POLLOUT 0x0004/* Writing now will not block */
 # define POLLERR 0x0008/* Error condition */
 # define POLLHUP 0x0010/* Hung up */
 # define POLLNVAL0x0020/* Invalid request: fd not open */
+#endif
 
 # ifndef PHP_USE_POLL_2_EMULATION
 #  define PHP_USE_POLL_2_EMULATION 1

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