[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS
jani Fri, 04 Sep 2009 22:11:32 + Revision: http://svn.php.net/viewvc?view=revision&revision=288072 Log: - some styling Changed paths: U php/php-src/branches/PHP_5_2/NEWS Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-09-04 21:47:07 UTC (rev 288071) +++ php/php-src/branches/PHP_5_2/NEWS 2009-09-04 22:11:32 UTC (rev 288072) @@ -2,8 +2,8 @@ ||| 0? Sep 2009, PHP 5.2.11 - Fixed bug #48060 (pdo_pgsql - large objects are returned as empty). (Matteo) -- Fixed bug #49447 (php engine need to correctly check for socket API - return status on windows). (Sriram Natarajan) +- Fixed bug #49447 (php engine needs to correctly check for socket API return + status on windows). (Sriram Natarajan) 03 Sep 2009, PHP 5.2.11RC2 @@ -28,7 +28,7 @@ files from function). (Stas) - Fixed bug #48696 (ldap_read() segfaults with invalid parameters). (Felipe) - Fixed bug #47273 (Encoding bug in SoapServer->fault). (Dmitry) -- Fixed bug #28038 (Sent incorrect RCPT TO commands to SMTP server) (Garrett) +- Fixed bug #28038 (Sent incorrect RCPT TO commands to SMTP server) (Garrett) 13 Aug 2009, PHP 5.2.11RC1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/sockets/php_sockets.h branches/PHP_5_3/ext/sockets/sockets.c trunk/ext/sockets/php_sockets.h trunk/ext/sockets/sockets.c
pajoye Fri, 04 Sep 2009 19:53:39 +
Revision: http://svn.php.net/viewvc?view=revision&revision=288067
Log:
- #49464, fix build
Bug: http://bugs.php.net/49464 (Open) php_sockets build broken
Changed paths:
U php/php-src/branches/PHP_5_3/ext/sockets/php_sockets.h
U php/php-src/branches/PHP_5_3/ext/sockets/sockets.c
U php/php-src/trunk/ext/sockets/php_sockets.h
U php/php-src/trunk/ext/sockets/sockets.c
Modified: php/php-src/branches/PHP_5_3/ext/sockets/php_sockets.h
===
--- php/php-src/branches/PHP_5_3/ext/sockets/php_sockets.h 2009-09-04
19:36:02 UTC (rev 288066)
+++ php/php-src/branches/PHP_5_3/ext/sockets/php_sockets.h 2009-09-04
19:53:39 UTC (rev 288067)
@@ -73,7 +73,9 @@
#ifndef PHP_WIN32
typedef int PHP_SOCKET;
+# define PHP_SOCKETS_API PHPAPI
#else
+# define PHP_SOCKETS_API __declspec(dllexport)
typedef SOCKET PHP_SOCKET;
#endif
@@ -91,7 +93,7 @@
};
#endif
-PHPAPI int php_sockets_le_socket(void);
+PHP_SOCKETS_API int php_sockets_le_socket(void);
/* Prototypes */
#ifdef ilia_0 /* not needed, only causes a compiler warning */
Modified: php/php-src/branches/PHP_5_3/ext/sockets/sockets.c
===
--- php/php-src/branches/PHP_5_3/ext/sockets/sockets.c 2009-09-04 19:36:02 UTC
(rev 288066)
+++ php/php-src/branches/PHP_5_3/ext/sockets/sockets.c 2009-09-04 19:53:39 UTC
(rev 288067)
@@ -323,7 +323,7 @@
/* inet_ntop should be used instead of inet_ntoa */
int inet_ntoa_lock = 0;
-PHPAPI int php_sockets_le_socket(void) /* {{{ */
+PHP_SOCKETS_API int php_sockets_le_socket(void) /* {{{ */
{
return le_socket;
}
Modified: php/php-src/trunk/ext/sockets/php_sockets.h
===
--- php/php-src/trunk/ext/sockets/php_sockets.h 2009-09-04 19:36:02 UTC (rev
288066)
+++ php/php-src/trunk/ext/sockets/php_sockets.h 2009-09-04 19:53:39 UTC (rev
288067)
@@ -73,8 +73,10 @@
#ifndef PHP_WIN32
typedef int PHP_SOCKET;
+# define PHP_SOCKETS_API __declspec(dllexport)
#else
typedef SOCKET PHP_SOCKET;
+# define PHP_SOCKETS_API PHPAPI
#endif
typedef struct {
@@ -91,7 +93,7 @@
};
#endif
-PHPAPI int php_sockets_le_socket(void);
+PHP_SOCKETS_API int php_sockets_le_socket(void);
/* Prototypes */
#ifdef ilia_0 /* not needed, only causes a compiler warning */
Modified: php/php-src/trunk/ext/sockets/sockets.c
===
--- php/php-src/trunk/ext/sockets/sockets.c 2009-09-04 19:36:02 UTC (rev
288066)
+++ php/php-src/trunk/ext/sockets/sockets.c 2009-09-04 19:53:39 UTC (rev
288067)
@@ -323,7 +323,8 @@
/* inet_ntop should be used instead of inet_ntoa */
int inet_ntoa_lock = 0;
-PHPAPI int php_sockets_le_socket(void) /* {{{ */
+
+PHP_SOCKETS_API int php_sockets_le_socket(void) /* {{{ */
{
return le_socket;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/main/main.c trunk/main/main.c
jani Fri, 04 Sep 2009 11:02:40 +
Revision: http://svn.php.net/viewvc?view=revision&revision=288038
Log:
I have no idea. This might or might not fix a bug in some branch. At least it
works.
Changed paths:
U php/php-src/branches/PHP_5_3/main/main.c
U php/php-src/trunk/main/main.c
Modified: php/php-src/branches/PHP_5_3/main/main.c
===
--- php/php-src/branches/PHP_5_3/main/main.c2009-09-04 10:21:17 UTC (rev
288037)
+++ php/php-src/branches/PHP_5_3/main/main.c2009-09-04 11:02:40 UTC (rev
288038)
@@ -1927,33 +1927,6 @@
return FAILURE;
}
- /* Check for deprecated directives */
- {
- static const char *directives[] = {
- "define_syslog_variables",
- "register_globals",
- "register_long_arrays",
- "safe_mode",
- "magic_quotes_gpc",
- "magic_quotes_runtime",
- "magic_quotes_sybase",
- NULL};
- const char **p = directives;
- long val;
-
- while (*p) {
- if (cfg_get_long((char*)*p, &val) == SUCCESS && val) {
- zend_error(E_WARNING, "Directive '%s' is
deprecated in PHP 5.3 and greater", *p);
- }
- ++p;
- }
-
- /* This is not too nice, but since its the only one theres no
need for extra stuff here */
- if (cfg_get_long("zend.ze1_compatibility_mode", &val) ==
SUCCESS && val) {
- zend_error(E_ERROR, "zend.ze1_compatibility_mode is no
longer supported in PHP 5.3 and greater");
- }
- }
-
/* Register PHP core ini entries */
REGISTER_INI_ENTRIES();
@@ -2047,6 +2020,34 @@
shutdown_memory_manager(1, 0 TSRMLS_CC);
+ /* Check for deprecated directives */
+ {
+ static const char *directives[] = {
+ "define_syslog_variables",
+ "register_globals",
+ "register_long_arrays",
+ "safe_mode",
+ "magic_quotes_gpc",
+ "magic_quotes_runtime",
+ "magic_quotes_sybase",
+ NULL
+ };
+ const char **p = directives;
+ long val;
+
+ while (*p) {
+ if (cfg_get_long((char*)*p, &val) == SUCCESS && val) {
+ zend_error(E_WARNING, "Directive '%s' is
deprecated in PHP 5.3 and greater", *p);
+ }
+ ++p;
+ }
+
+ /* This is not too nice, but since its the only one theres no
need for extra stuff here */
+ if (cfg_get_long("zend.ze1_compatibility_mode", &val) ==
SUCCESS && val) {
+ zend_error(E_ERROR, "zend.ze1_compatibility_mode is no
longer supported in PHP 5.3 and greater");
+ }
+ }
+
/* we're done */
return SUCCESS;
}
Modified: php/php-src/trunk/main/main.c
===
--- php/php-src/trunk/main/main.c 2009-09-04 10:21:17 UTC (rev 288037)
+++ php/php-src/trunk/main/main.c 2009-09-04 11:02:40 UTC (rev 288038)
@@ -1473,7 +1473,7 @@
zend_set_timeout(PG(max_input_time), 1);
}
- /* Disable realpath cache if safe_mode or open_basedir are set
*/
+ /* Disable realpath cache if open_basedir is set */
if (PG(open_basedir) && *PG(open_basedir)) {
CWDG(realpath_cache_size_limit) = 0;
}
@@ -2040,7 +2040,7 @@
return FAILURE;
}
- /* Check for deprecated directives */
+ /* Check for removed directives */
{
static const char *directives[] = {
"define_syslog_variables",
@@ -2051,13 +2051,14 @@
"magic_quotes_runtime",
"magic_quotes_sybase",
"zend.ze1_compatibility_mode",
- NULL};
+ NULL
+ };
const char **p = directives;
long val;
while (*p) {
if (cfg_get_long((char*)*p, &val) == SUCCESS && val) {
- zend_error(E_WARNING, "Directive '%s' is no
longer supported in PHP 6 and greater", *p);
+ zend_error(E_ERROR, "Directive '%s' no longer
exist in PHP 6 and greater", *p);
}
++p;
}
--
PHP CVS Mailing List (http://www.php.net/)
To uns
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/ftp/ftp.c branches/PHP_5_2/ext/openssl/xp_ssl.c branches/PHP_5_2/ext/sockets/sockets.c branches/PHP_5_2/main/network.c branches/
srinatar Fri, 04 Sep 2009 07:59:48 +
Revision: http://svn.php.net/viewvc?view=revision&revision=288034
Log:
- Fixed bug #49447 (php engine need to correctly check for socket API
return status on windows). (Sriram Natarajan)
Bug: http://bugs.php.net/49447 (Assigned) php engine need to correctly check
for socket API return status on windows
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/ftp/ftp.c
U php/php-src/branches/PHP_5_2/ext/openssl/xp_ssl.c
U php/php-src/branches/PHP_5_2/ext/sockets/sockets.c
U php/php-src/branches/PHP_5_2/main/network.c
U php/php-src/branches/PHP_5_2/main/streams/xp_socket.c
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/ftp/ftp.c
U php/php-src/branches/PHP_5_3/ext/openssl/xp_ssl.c
U php/php-src/branches/PHP_5_3/ext/sockets/sockets.c
U php/php-src/branches/PHP_5_3/main/network.c
U php/php-src/branches/PHP_5_3/main/streams/xp_socket.c
U php/php-src/trunk/ext/ftp/ftp.c
U php/php-src/trunk/ext/openssl/xp_ssl.c
U php/php-src/trunk/ext/sockets/sockets.c
U php/php-src/trunk/main/network.c
U php/php-src/trunk/main/streams/xp_socket.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS 2009-09-04 07:57:24 UTC (rev 288033)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-09-04 07:59:48 UTC (rev 288034)
@@ -2,6 +2,8 @@
|||
0? Sep 2009, PHP 5.2.11
- Fixed bug #48060 (pdo_pgsql - large objects are returned as empty). (Matteo)
+- Fixed bug #49447 (php engine need to correctly check for socket API
+ return status on windows). (Sriram Natarajan)
03 Sep 2009, PHP 5.2.11RC2
Modified: php/php-src/branches/PHP_5_2/ext/ftp/ftp.c
===
--- php/php-src/branches/PHP_5_2/ext/ftp/ftp.c 2009-09-04 07:57:24 UTC (rev 288033)
+++ php/php-src/branches/PHP_5_2/ext/ftp/ftp.c 2009-09-04 07:59:48 UTC (rev 288034)
@@ -147,7 +147,7 @@
size = sizeof(ftp->localaddr);
memset(&ftp->localaddr, 0, size);
- if (getsockname(ftp->fd, (struct sockaddr*) &ftp->localaddr, &size) == -1) {
+ if (getsockname(ftp->fd, (struct sockaddr*) &ftp->localaddr, &size) != 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "getsockname failed: %s (%d)", strerror(errno), errno);
goto bail;
}
@@ -1387,7 +1387,7 @@
sa = (struct sockaddr *) &ftp->localaddr;
/* bind/listen */
- if ((fd = socket(sa->sa_family, SOCK_STREAM, 0)) == -1) {
+ if ((fd = socket(sa->sa_family, SOCK_STREAM, 0)) == SOCK_ERR) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "socket() failed: %s (%d)", strerror(errno), errno);
goto bail;
}
@@ -1420,17 +1420,17 @@
php_any_addr(sa->sa_family, &addr, 0);
size = php_sockaddr_size(&addr);
- if (bind(fd, (struct sockaddr*) &addr, size) == -1) {
+ if (bind(fd, (struct sockaddr*) &addr, size) != 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "bind() failed: %s (%d)", strerror(errno), errno);
goto bail;
}
- if (getsockname(fd, (struct sockaddr*) &addr, &size) == -1) {
+ if (getsockname(fd, (struct sockaddr*) &addr, &size) != 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "getsockname() failed: %s (%d)", strerror(errno), errno);
goto bail;
}
- if (listen(fd, 5) == -1) {
+ if (listen(fd, 5) != 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "listen() failed: %s (%d)", strerror(errno), errno);
goto bail;
}
Modified: php/php-src/branches/PHP_5_2/ext/openssl/xp_ssl.c
===
--- php/php-src/branches/PHP_5_2/ext/openssl/xp_ssl.c 2009-09-04 07:57:24 UTC (rev 288033)
+++ php/php-src/branches/PHP_5_2/ext/openssl/xp_ssl.c 2009-09-04 07:59:48 UTC (rev 288034)
@@ -272,6 +272,10 @@
SSL_CTX_free(sslsock->ctx);
sslsock->ctx = NULL;
}
+#ifdef PHP_WIN32
+ if (sslsock->s.socket == -1)
+ sslsock->s.socket = SOCK_ERR;
+#endif
if (sslsock->s.socket != SOCK_ERR) {
#ifdef PHP_WIN32
/* prevent more data from coming in */
Modified: php/php-src/branches/PHP_5_2/ext/sockets/sockets.c
===
--- php/php-src/branches/PHP_5_2/ext/sockets/sockets.c 2009-09-04 07:57:24 UTC (rev 288033)
+++ php/php-src/branches/PHP_5_2/ext/sockets/sockets.c 2009-09-04 07:59:48 UTC (rev 288034)
@@ -228,14 +228,14 @@
sock->type = PF_INET;
- if (bind(sock->bsd_socket, (struct sockaddr *)&la, sizeof(la)) < 0) {
+ if (bind(sock->bsd_socket, (struct sockaddr *)&la, sizeof(la)) != 0) {
PHP_SOCKET_ERROR(sock, "unable to bind to given address", errno);
close(sock->bsd_socket);
efree(sock);
return 0;
}
- if (listen(sock->bsd_socket, backlog) < 0) {
+ if (listen(sock->bsd_socket, backlog) != 0) {
PHP_SOCKET_ERROR(sock, "unable to lis
[PHP-CVS] svn: /php/win-installer/trunk/ ExtensionsFeatures52.wxs ExtensionsFeatures53.wxs ExtensionsFeatures60.wxs ExtensionsFragment52.wxs
pajoye Fri, 04 Sep 2009 07:57:24 + Revision: http://svn.php.net/viewvc?view=revision&revision=288033 Log: - WS Changed paths: U php/win-installer/trunk/ExtensionsFeatures52.wxs U php/win-installer/trunk/ExtensionsFeatures53.wxs U php/win-installer/trunk/ExtensionsFeatures60.wxs U php/win-installer/trunk/ExtensionsFragment52.wxs Modified: php/win-installer/trunk/ExtensionsFeatures52.wxs === --- php/win-installer/trunk/ExtensionsFeatures52.wxs 2009-09-04 07:56:46 UTC (rev 288032) +++ php/win-installer/trunk/ExtensionsFeatures52.wxs 2009-09-04 07:57:24 UTC (rev 288033) @@ -306,10 +306,10 @@ - + - + Modified: php/win-installer/trunk/ExtensionsFeatures53.wxs === --- php/win-installer/trunk/ExtensionsFeatures53.wxs 2009-09-04 07:56:46 UTC (rev 288032) +++ php/win-installer/trunk/ExtensionsFeatures53.wxs 2009-09-04 07:57:24 UTC (rev 288033) @@ -118,7 +118,7 @@ - + @@ -180,7 +180,7 @@ - + @@ -304,15 +304,15 @@ - + - + - + @@ -328,7 +328,7 @@ - + @@ -372,7 +372,7 @@ - + Modified: php/win-installer/trunk/ExtensionsFeatures60.wxs === --- php/win-installer/trunk/ExtensionsFeatures60.wxs 2009-09-04 07:56:46 UTC (rev 288032) +++ php/win-installer/trunk/ExtensionsFeatures60.wxs 2009-09-04 07:57:24 UTC (rev 288033) @@ -118,7 +118,7 @@ - + @@ -304,15 +304,15 @@ - + - + - + @@ -328,7 +328,7 @@ - + @@ -372,7 +372,7 @@ - + Modified: php/win-installer/trunk/ExtensionsFragment52.wxs === --- php/win-installer/trunk/ExtensionsFragment52.wxs 2009-09-04 07:56:46 UTC (rev 288032) +++ php/win-installer/trunk/ExtensionsFragment52.wxs 2009-09-04 07:57:24 UTC (rev 288033) @@ -48,7 +48,7 @@ Section="PHP" Value=""[INSTALLDIR]ext"" /> - + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/win-installer/trunk/ ExtensionsFeatures52.wxs
pajoye Fri, 04 Sep 2009 07:37:07 + Revision: http://svn.php.net/viewvc?view=revision&revision=288030 Log: - fix install of pgsql and mssql, required DLLs were not installed Changed paths: U php/win-installer/trunk/ExtensionsFeatures52.wxs Modified: php/win-installer/trunk/ExtensionsFeatures52.wxs === --- php/win-installer/trunk/ExtensionsFeatures52.wxs2009-09-04 07:28:53 UTC (rev 288029) +++ php/win-installer/trunk/ExtensionsFeatures52.wxs2009-09-04 07:37:07 UTC (rev 288030) @@ -220,6 +220,7 @@ + @@ -283,6 +284,7 @@ + @@ -299,6 +301,7 @@ + @@ -322,6 +325,7 @@ + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
