[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/sockets/config.m4 branches/PHP_5_3/ext/sockets/php_sockets.h branches/PHP_5_3/ext/sockets/sockets.c trunk/ext/sockets/config.m4 trunk/ext/sockets/php_
mkoppanenSun, 27 Dec 2009 01:00:50 +
Revision: http://svn.php.net/viewvc?view=revision&revision=292683
Log:
Share the php_sockets.h header
Share php_sockets_le_socket_name
Changed paths:
U php/php-src/branches/PHP_5_3/ext/sockets/config.m4
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/config.m4
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/config.m4
===
--- php/php-src/branches/PHP_5_3/ext/sockets/config.m4 2009-12-27 00:43:33 UTC
(rev 292682)
+++ php/php-src/branches/PHP_5_3/ext/sockets/config.m4 2009-12-27 01:00:50 UTC
(rev 292683)
@@ -29,4 +29,5 @@
AC_DEFINE([HAVE_SOCKETS], 1, [ ])
PHP_NEW_EXTENSION([sockets], [sockets.c], [$ext_shared])
+ PHP_INSTALL_HEADERS([ext/sockets/], [php_sockets.h])
fi
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-12-27
00:43:33 UTC (rev 292682)
+++ php/php-src/branches/PHP_5_3/ext/sockets/php_sockets.h 2009-12-27
01:00:50 UTC (rev 292683)
@@ -95,6 +95,8 @@
PHP_SOCKETS_API int php_sockets_le_socket(void);
+#define php_sockets_le_socket_name "Socket"
+
/* Prototypes */
#ifdef ilia_0 /* not needed, only causes a compiler warning */
static int php_open_listen_sock(php_socket **php_sock, int port, int backlog
TSRMLS_DC);
Modified: php/php-src/branches/PHP_5_3/ext/sockets/sockets.c
===
--- php/php-src/branches/PHP_5_3/ext/sockets/sockets.c 2009-12-27 00:43:33 UTC
(rev 292682)
+++ php/php-src/branches/PHP_5_3/ext/sockets/sockets.c 2009-12-27 01:00:50 UTC
(rev 292683)
@@ -110,7 +110,7 @@
php_error_docref(NULL
TSRMLS_CC, E_WARNING, "%s [%d]: %s", msg, errn, php_strerror(errn TSRMLS_CC))
static int le_socket;
-#define le_socket_name "Socket"
+#define le_socket_name php_sockets_le_socket_name
/* {{{ arginfo */
ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_select, 0, 0, 4)
Modified: php/php-src/trunk/ext/sockets/config.m4
===
--- php/php-src/trunk/ext/sockets/config.m4 2009-12-27 00:43:33 UTC (rev
292682)
+++ php/php-src/trunk/ext/sockets/config.m4 2009-12-27 01:00:50 UTC (rev
292683)
@@ -29,4 +29,5 @@
AC_DEFINE([HAVE_SOCKETS], 1, [ ])
PHP_NEW_EXTENSION([sockets], [sockets.c], [$ext_shared])
+ PHP_INSTALL_HEADERS([ext/sockets/], [php_sockets.h])
fi
Modified: php/php-src/trunk/ext/sockets/php_sockets.h
===
--- php/php-src/trunk/ext/sockets/php_sockets.h 2009-12-27 00:43:33 UTC (rev
292682)
+++ php/php-src/trunk/ext/sockets/php_sockets.h 2009-12-27 01:00:50 UTC (rev
292683)
@@ -95,6 +95,8 @@
PHP_SOCKETS_API int php_sockets_le_socket(void);
+#define php_sockets_le_socket_name "Socket"
+
/* Prototypes */
#ifdef ilia_0 /* not needed, only causes a compiler warning */
static int php_open_listen_sock(php_socket **php_sock, int port, int backlog
TSRMLS_DC);
Modified: php/php-src/trunk/ext/sockets/sockets.c
===
--- php/php-src/trunk/ext/sockets/sockets.c 2009-12-27 00:43:33 UTC (rev
292682)
+++ php/php-src/trunk/ext/sockets/sockets.c 2009-12-27 01:00:50 UTC (rev
292683)
@@ -110,7 +110,7 @@
php_error_docref(NULL
TSRMLS_CC, E_WARNING, "%s [%d]: %s", msg, errn, php_strerror(errn TSRMLS_CC))
static int le_socket;
-#define le_socket_name "Socket"
+#define le_socket_name php_sockets_le_socket_name
/* {{{ arginfo */
ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_select, 0, 0, 4)
--
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/fileinfo/libmagic/apprentice.c trunk/ext/fileinfo/libmagic/apprentice.c
mkoppanenSun, 27 Dec 2009 00:43:33 +
Revision: http://svn.php.net/viewvc?view=revision&revision=292682
Log:
spprintf the dbname
use VCWD_ACCESS instead of access
Changed paths:
U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/apprentice.c
U php/php-src/trunk/ext/fileinfo/libmagic/apprentice.c
Modified: php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/apprentice.c
===
--- php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/apprentice.c
2009-12-26 23:59:19 UTC (rev 292681)
+++ php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/apprentice.c
2009-12-27 00:43:33 UTC (rev 292682)
@@ -2120,7 +2120,7 @@
}
if (dbname) {
- free(dbname);
+ efree(dbname);
}
return ret;
@@ -2137,7 +2137,7 @@
}
error2:
if (dbname) {
- free(dbname);
+ efree(dbname);
}
return -1;
}
@@ -2195,7 +2195,7 @@
rv = 0;
out:
- free(dbname);
+ efree(dbname);
return rv;
}
@@ -2229,14 +2229,14 @@
q++;
/* Compatibility with old code that looked in .mime */
if (ms->flags & MAGIC_MIME) {
- asprintf(&buf, "%.*s.mime%s", (int)(q - fn), fn, ext);
- if (access(buf, R_OK) != -1) {
+ spprintf(&buf, MAXPATHLEN, "%.*s.mime%s", (int)(q - fn), fn,
ext);
+ if (VCWD_ACCESS(buf, R_OK) != -1) {
ms->flags &= MAGIC_MIME_TYPE;
return buf;
}
- free(buf);
+ efree(buf);
}
- asprintf(&buf, "%.*s%s", (int)(q - fn), fn, ext);
+ spprintf(&buf, MAXPATHLEN, "%.*s%s", (int)(q - fn), fn, ext);
/* Compatibility with old code that looked in .mime */
if (strstr(p, ".mime") != NULL)
Modified: php/php-src/trunk/ext/fileinfo/libmagic/apprentice.c
===
--- php/php-src/trunk/ext/fileinfo/libmagic/apprentice.c2009-12-26
23:59:19 UTC (rev 292681)
+++ php/php-src/trunk/ext/fileinfo/libmagic/apprentice.c2009-12-27
00:43:33 UTC (rev 292682)
@@ -2120,7 +2120,7 @@
}
if (dbname) {
- free(dbname);
+ efree(dbname);
}
return ret;
@@ -2137,7 +2137,7 @@
}
error2:
if (dbname) {
- free(dbname);
+ efree(dbname);
}
return -1;
}
@@ -2195,7 +2195,7 @@
rv = 0;
out:
- free(dbname);
+ efree(dbname);
return rv;
}
@@ -2229,14 +2229,14 @@
q++;
/* Compatibility with old code that looked in .mime */
if (ms->flags & MAGIC_MIME) {
- asprintf(&buf, "%.*s.mime%s", (int)(q - fn), fn, ext);
- if (access(buf, R_OK) != -1) {
+ spprintf(&buf, MAXPATHLEN, "%.*s.mime%s", (int)(q - fn), fn,
ext);
+ if (VCWD_ACCESS(buf, R_OK) != -1) {
ms->flags &= MAGIC_MIME_TYPE;
return buf;
}
- free(buf);
+ efree(buf);
}
- asprintf(&buf, "%.*s%s", (int)(q - fn), fn, ext);
+ spprintf(&buf, MAXPATHLEN, "%.*s%s", (int)(q - fn), fn, ext);
/* Compatibility with old code that looked in .mime */
if (strstr(p, ".mime") != NULL)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/standard/ streamsfuncs.c
mkoppanenSat, 26 Dec 2009 14:54:34 +
Revision: http://svn.php.net/viewvc?view=revision&revision=292653
Log:
No need to duplicate the string here
Changed paths:
U php/php-src/trunk/ext/standard/streamsfuncs.c
Modified: php/php-src/trunk/ext/standard/streamsfuncs.c
===
--- php/php-src/trunk/ext/standard/streamsfuncs.c 2009-12-26 14:11:48 UTC
(rev 292652)
+++ php/php-src/trunk/ext/standard/streamsfuncs.c 2009-12-26 14:54:34 UTC
(rev 292653)
@@ -1691,7 +1691,7 @@
efree(resolved_path);
RETURN_UNICODEL(ustr, ulen, 0);
} else {
- RETURN_STRINGL(resolved_path, strlen(resolved_path), 1);
+ RETURN_STRINGL(resolved_path, strlen(resolved_path), 0);
}
}
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/standard/ streamsfuncs.c
mkoppanenThu, 24 Dec 2009 13:57:21 +
Revision: http://svn.php.net/viewvc?view=revision&revision=292596
Log:
Fix the proto entry for trunk
Changed paths:
U php/php-src/trunk/ext/standard/streamsfuncs.c
Modified: php/php-src/trunk/ext/standard/streamsfuncs.c
===
--- php/php-src/trunk/ext/standard/streamsfuncs.c 2009-12-24 13:12:03 UTC
(rev 292595)
+++ php/php-src/trunk/ext/standard/streamsfuncs.c 2009-12-24 13:57:21 UTC
(rev 292596)
@@ -1668,7 +1668,7 @@
}
/* }}} */
-/* {{{ proto string stream_resolve_include_path(string filename) U
+/* {{{ proto string stream_resolve_include_path(string filename [, resource
context]) U
Determine what file will be opened by calls to fopen() with a relative path */
PHP_FUNCTION(stream_resolve_include_path)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/basic_functions.c branches/PHP_5_3/ext/standard/streamsfuncs.c branches/PHP_5_3/ext/standard/streamsfuncs.h branches/PH
mkoppanenThu, 24 Dec 2009 13:12:03 +
Revision: http://svn.php.net/viewvc?view=revision&revision=292595
Log:
Changed stream_resolve_include_path to use zend_resolve_path
backported stream_resolve_include_path to PHP 5.3
backported stream_resolve_include_path test to PHP 5.3
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
U php/php-src/branches/PHP_5_3/ext/standard/streamsfuncs.c
U php/php-src/branches/PHP_5_3/ext/standard/streamsfuncs.h
A
php/php-src/branches/PHP_5_3/ext/standard/tests/streams/stream_resolve_include_path.phpt
U php/php-src/trunk/ext/standard/streamsfuncs.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-12-24 13:07:33 UTC (rev 292594)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-12-24 13:12:03 UTC (rev 292595)
@@ -29,6 +29,7 @@
- Added support for CURLOPT_CERTINFO. FR #49253.
(Linus Nielsen Feltzing )
- Added client-side server name indication support in openssl. (Arnaud)
+- Added stream_resolve_include_path() (Mikko)
- Improved fix for bug #50006 (Segfault caused by uksort()). (Stas)
Modified: php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2009-12-24
13:07:33 UTC (rev 292594)
+++ php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2009-12-24
13:12:03 UTC (rev 292595)
@@ -2010,6 +2010,10 @@
ZEND_BEGIN_ARG_INFO(arginfo_stream_get_wrappers, 0)
ZEND_END_ARG_INFO()
+ZEND_BEGIN_ARG_INFO(arginfo_stream_resolve_include_path, 0)
+ ZEND_ARG_INFO(0, filename)
+ZEND_END_ARG_INFO()
+
ZEND_BEGIN_ARG_INFO(arginfo_stream_is_local, 0)
ZEND_ARG_INFO(0, stream)
ZEND_END_ARG_INFO()
@@ -3115,6 +3119,7 @@
PHP_FE(stream_wrapper_restore,
arginfo_stream_wrapper_restore)
PHP_FE(stream_get_wrappers,
arginfo_stream_get_wrappers)
PHP_FE(stream_get_transports,
arginfo_stream_get_transports)
+ PHP_FE(stream_resolve_include_path,
arginfo_stream_resolve_include_path)
PHP_FE(stream_is_local,
arginfo_stream_is_local)
PHP_FE(get_headers,
arginfo_get_headers)
Modified: php/php-src/branches/PHP_5_3/ext/standard/streamsfuncs.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/streamsfuncs.c2009-12-24
13:07:33 UTC (rev 292594)
+++ php/php-src/branches/PHP_5_3/ext/standard/streamsfuncs.c2009-12-24
13:12:03 UTC (rev 292595)
@@ -1442,6 +1442,26 @@
}
/* }}} */
+/* {{{ proto string stream_resolve_include_path(string filename)
+Determine what file will be opened by calls to fopen() with a relative path */
+PHP_FUNCTION(stream_resolve_include_path)
+{
+ char *filename, *resolved_path;
+ int filename_len;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &filename,
&filename_len) == FAILURE) {
+ return;
+ }
+
+ resolved_path = zend_resolve_path(filename, filename_len TSRMLS_CC);
+
+ if (resolved_path) {
+ RETURN_STRING(resolved_path, 0);
+ }
+ RETURN_FALSE;
+}
+/* }}} */
+
/* {{{ proto bool stream_is_local(resource stream|string url) U
*/
PHP_FUNCTION(stream_is_local)
Modified: php/php-src/branches/PHP_5_3/ext/standard/streamsfuncs.h
===
--- php/php-src/branches/PHP_5_3/ext/standard/streamsfuncs.h2009-12-24
13:07:33 UTC (rev 292594)
+++ php/php-src/branches/PHP_5_3/ext/standard/streamsfuncs.h2009-12-24
13:12:03 UTC (rev 292595)
@@ -56,6 +56,7 @@
PHP_FUNCTION(stream_filter_remove);
PHP_FUNCTION(stream_socket_enable_crypto);
PHP_FUNCTION(stream_socket_shutdown);
+PHP_FUNCTION(stream_resolve_include_path);
PHP_FUNCTION(stream_is_local);
PHP_FUNCTION(stream_supports_lock);
Added:
php/php-src/branches/PHP_5_3/ext/standard/tests/streams/stream_resolve_include_path.phpt
===
---
php/php-src/branches/PHP_5_3/ext/standard/tests/streams/stream_resolve_include_path.phpt
(rev 0)
+++
php/php-src/branches/PHP_5_3/ext/standard/tests/streams/stream_resolve_include_path.phpt
2009-12-24 13:12:03 UTC (rev 292595)
@@ -
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/openssl/xp_ssl.c branches/PHP_5_3/ext/openssl/xp_ssl.c trunk/ext/openssl/xp_ssl.c
mkoppanenSat, 22 Aug 2009 02:31:23 +
Revision: http://svn.php.net/viewvc?view=revision&revision=287563
Log:
Fixes a memory leak in ssl streams. The context was not properly freed
Changed paths:
U php/php-src/branches/PHP_5_2/ext/openssl/xp_ssl.c
U php/php-src/branches/PHP_5_3/ext/openssl/xp_ssl.c
U php/php-src/trunk/ext/openssl/xp_ssl.c
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-08-21 22:47:18 UTC
(rev 287562)
+++ php/php-src/branches/PHP_5_2/ext/openssl/xp_ssl.c 2009-08-22 02:31:23 UTC
(rev 287563)
@@ -47,6 +47,7 @@
typedef struct _php_openssl_netstream_data_t {
php_netstream_data_t s;
SSL *ssl_handle;
+ SSL_CTX *ctx;
struct timeval connect_timeout;
int enable_on_connect;
int is_client;
@@ -267,6 +268,10 @@
SSL_free(sslsock->ssl_handle);
sslsock->ssl_handle = NULL;
}
+ if (sslsock->ctx) {
+ SSL_CTX_free(sslsock->ctx);
+ sslsock->ctx = NULL;
+ }
if (sslsock->s.socket != SOCK_ERR) {
#ifdef PHP_WIN32
/* prevent more data from coming in */
@@ -308,7 +313,6 @@
php_stream_xport_crypto_param *cparam
TSRMLS_DC)
{
- SSL_CTX *ctx;
SSL_METHOD *method;
if (sslsock->ssl_handle) {
@@ -357,18 +361,19 @@
}
- ctx = SSL_CTX_new(method);
- if (ctx == NULL) {
+ sslsock->ctx = SSL_CTX_new(method);
+ if (sslsock->ctx == NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed to create
an SSL context");
return -1;
}
- SSL_CTX_set_options(ctx, SSL_OP_ALL);
+ SSL_CTX_set_options(sslsock->ctx, SSL_OP_ALL);
- sslsock->ssl_handle = php_SSL_new_from_context(ctx, stream TSRMLS_CC);
+ sslsock->ssl_handle = php_SSL_new_from_context(sslsock->ctx, stream
TSRMLS_CC);
if (sslsock->ssl_handle == NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed to create
an SSL handle");
- SSL_CTX_free(ctx);
+ SSL_CTX_free(sslsock->ctx);
+ sslsock->ctx = NULL;
return -1;
}
@@ -789,6 +794,9 @@
* connecting */
sslsock->s.socket = -1;
+ /* Initialize context as NULL */
+ sslsock->ctx = NULL;
+
stream = php_stream_alloc_rel(&php_openssl_socket_ops, sslsock,
persistent_id, "r+");
if (stream == NULL) {
Modified: php/php-src/branches/PHP_5_3/ext/openssl/xp_ssl.c
===
--- php/php-src/branches/PHP_5_3/ext/openssl/xp_ssl.c 2009-08-21 22:47:18 UTC
(rev 287562)
+++ php/php-src/branches/PHP_5_3/ext/openssl/xp_ssl.c 2009-08-22 02:31:23 UTC
(rev 287563)
@@ -48,6 +48,7 @@
typedef struct _php_openssl_netstream_data_t {
php_netstream_data_t s;
SSL *ssl_handle;
+ SSL_CTX *ctx;
struct timeval connect_timeout;
int enable_on_connect;
int is_client;
@@ -254,6 +255,10 @@
SSL_free(sslsock->ssl_handle);
sslsock->ssl_handle = NULL;
}
+ if (sslsock->ctx) {
+ SSL_CTX_free(sslsock->ctx);
+ sslsock->ctx = NULL;
+ }
if (sslsock->s.socket != SOCK_ERR) {
#ifdef PHP_WIN32
/* prevent more data from coming in */
@@ -295,7 +300,6 @@
php_stream_xport_crypto_param *cparam
TSRMLS_DC)
{
- SSL_CTX *ctx;
SSL_METHOD *method;
if (sslsock->ssl_handle) {
@@ -344,18 +348,19 @@
}
- ctx = SSL_CTX_new(method);
- if (ctx == NULL) {
+ sslsock->ctx = SSL_CTX_new(method);
+ if (sslsock->ctx == NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed to create
an SSL context");
return -1;
}
- SSL_CTX_set_options(ctx, SSL_OP_ALL);
+ SSL_CTX_set_options(sslsock->ctx, SSL_OP_ALL);
- sslsock->ssl_handle = php_SSL_new_from_context(ctx, stream TSRMLS_CC);
+ sslsock->ssl_handle = php_SSL_new_from_context(sslsock->ctx, stream
TSRMLS_CC);
if (sslsock->ssl_handle == NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed to create
an SSL handle");
- SSL_CTX_free(ctx);
+ SSL_CTX_free(sslsock->ctx);
+ sslsock->ctx = NULL;
return -1;
}
@@ -776,6 +781,9 @@
* connecting */
sslsock->s.socket = -1;
+ /* Initialize context as NULL */
+ sslsock->ctx = NULL;
+
stream = php_stream_alloc_rel(&php_openssl_socket_ops, sslsock,
[PHP-CVS] cvs: php-src / NEWS /main php_ini.c
mkoppanen Sat Jun 27 15:22:06 2009 UTC
Modified files:
/php-srcNEWS
/php-src/main php_ini.c
Log:
[DOC]
Support multiple paths (separated by path_separator) in
config-file-scan-dir/PHP_INI_SCAN_DIR
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2182&r2=1.2183&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2182 php-src/NEWS:1.2183
--- php-src/NEWS:1.2182 Tue May 19 09:47:06 2009
+++ php-src/NEWSSat Jun 27 15:22:06 2009
@@ -6,6 +6,8 @@
- Changed "allow_url_fopen" and "allow_url_include" php.ini directives to allow
per-wrapper enable/disable and runtime tightening. (Sara)
+- Changed config-file-scan-dir/PHP_INI_SCAN_DIR to allow multiple paths (Mikko)
+
- Removed undocumented and incomplete support for strings in list() operator.
(Dmitry)
- Removed old legacy:
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.173&r2=1.174&diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.173 php-src/main/php_ini.c:1.174
--- php-src/main/php_ini.c:1.173Mon May 18 21:28:42 2009
+++ php-src/main/php_ini.c Sat Jun 27 15:22:06 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.c,v 1.173 2009/05/18 21:28:42 derick Exp $ */
+/* $Id: php_ini.c,v 1.174 2009/06/27 15:22:06 mkoppanen Exp $ */
#include "php.h"
#include "ext/standard/info.h"
@@ -349,7 +349,8 @@
char *open_basedir;
int free_ini_search_path = 0;
zend_file_handle fh;
-
+ static const char paths_separator[] = { ZEND_PATHS_SEPARATOR, 0 };
+
if (zend_hash_init(&configuration_hash, 0, NULL, (dtor_func_t)
config_zval_dtor, 1) == FAILURE) {
return FAILURE;
}
@@ -372,7 +373,6 @@
char *default_location;
char *env_location;
char *binary_location;
- static const char paths_separator[] = { ZEND_PATHS_SEPARATOR, 0
};
#ifdef PHP_WIN32
char *reg_location;
#endif
@@ -608,72 +608,83 @@
/* Scan and parse any .ini files found in scan path if path not empty.
*/
if (!sapi_module.php_ini_ignore && php_ini_scanned_path_len) {
- struct dirent **namelist;
int ndir, i;
struct stat sb;
char ini_file[MAXPATHLEN];
- char *p;
+ char *p, *last, *path_copy, *ini_path = NULL;
zend_file_handle fh;
zend_llist scanned_ini_list;
zend_llist_element *element;
int l, total_l = 0;
- /* Reset active ini section */
- RESET_ACTIVE_INI_HASH();
-
- if ((ndir = php_scandir(php_ini_scanned_path, &namelist, 0,
php_alphasort)) > 0) {
- zend_llist_init(&scanned_ini_list, sizeof(char *),
(llist_dtor_func_t) free_estring, 1);
- memset(&fh, 0, sizeof(fh));
-
- for (i = 0; i < ndir; i++) {
-
- /* check for any file with .ini extension */
- if (!(p = strrchr(namelist[i]->d_name, '.')) ||
(p && strcmp(p, ".ini"))) {
- free(namelist[i]);
- continue;
- }
- if
(IS_SLASH(php_ini_scanned_path[php_ini_scanned_path_len - 1])) {
- snprintf(ini_file, MAXPATHLEN, "%s%s",
php_ini_scanned_path, namelist[i]->d_name);
- } else {
- snprintf(ini_file, MAXPATHLEN,
"%s%c%s", php_ini_scanned_path, DEFAULT_SLASH, namelist[i]->d_name);
- }
- if (VCWD_STAT(ini_file, &sb) == 0) {
- if (S_ISREG(sb.st_mode)) {
- if ((fh.handle.fp =
VCWD_FOPEN(ini_file, "r"))) {
- fh.filename = ini_file;
- fh.type =
ZEND_HANDLE_FP;
-
- if
(zend_parse_ini_file(&fh, 1, ZEND_INI_SCANNER_NORMAL, (zend_ini_parser_cb_t)
php_ini_parser_cb, &configuration_hash TSRMLS_CC) == SUCCESS) {
- /* Here, add it
to the list of ini files read */
- l =
strlen(ini_file);
- total_l += l +
2;
- p =
estrndup(ini_file, l);
-
zend_llist_add_element(&scanned_ini_list, &p);
+ /* List of found ini files */
+ zend_llis
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
mkoppanen Mon Apr 20 10:03:21 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: NEWS entry related to #47991 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1473&r2=1.2027.2.547.2.1474&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1473 php-src/NEWS:1.2027.2.547.2.1474 --- php-src/NEWS:1.2027.2.547.2.1473Sun Apr 19 15:01:11 2009 +++ php-src/NEWSMon Apr 20 10:03:21 2009 @@ -11,6 +11,7 @@ - Fixed segfault on invalid session.save_path. (Hannes) - Fixed bug #47997 (stream_copy_to_stream returns 1 on empty streams). (Arnaud) +- Fixed bug #47991 (SSL streams fail if error stack contains items). (Mikko) - Fixed bug #47981 (error handler not called regardless). (Hannes) - Fixed bug #47969 (ezmlm_hash() returns different values depend on OS). (Ilia) -- 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/openssl openssl.c
mkoppanen Mon Apr 20 10:00:41 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/opensslopenssl.c
Log:
MFH: Closes #47991 SSL streams fail if error stack contains items
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.52&r2=1.98.2.5.2.53&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.52
php-src/ext/openssl/openssl.c:1.98.2.5.2.53
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.52 Sun Mar 29 23:33:01 2009
+++ php-src/ext/openssl/openssl.c Mon Apr 20 10:00:41 2009
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.98.2.5.2.52 2009/03/29 23:33:01 scottmac Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.53 2009/04/20 10:00:41 mkoppanen Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -3894,6 +3894,7 @@
char *cipherlist = NULL;
int ok = 1;
+ ERR_clear_error();
/* look at context options in the stream and set appropriate
verification flags */
if (GET_VER_OPT("verify_peer") && zval_is_true(*val)) {
--
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/openssl openssl.c
mkoppanen Mon Apr 20 09:44:30 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/opensslopenssl.c
Log:
MFH: Closes #47991 SSL streams fail if error stack contains items
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.41.2.28&r2=1.98.2.5.2.41.2.29&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.28
php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.29
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.28Sun Mar 29 23:32:34 2009
+++ php-src/ext/openssl/openssl.c Mon Apr 20 09:44:29 2009
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.98.2.5.2.41.2.28 2009/03/29 23:32:34 scottmac Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.41.2.29 2009/04/20 09:44:29 mkoppanen Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -4367,6 +4367,7 @@
char *cipherlist = NULL;
int ok = 1;
+ ERR_clear_error();
/* look at context options in the stream and set appropriate
verification flags */
if (GET_VER_OPT("verify_peer") && zval_is_true(*val)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/openssl openssl.c
mkoppanen Mon Apr 20 09:43:45 2009 UTC
Modified files:
/php-src/ext/opensslopenssl.c
Log:
Closes #47991 SSL streams fail if error stack contains items
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.180&r2=1.181&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.180 php-src/ext/openssl/openssl.c:1.181
--- php-src/ext/openssl/openssl.c:1.180 Sun Mar 29 23:32:17 2009
+++ php-src/ext/openssl/openssl.c Mon Apr 20 09:43:45 2009
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.180 2009/03/29 23:32:17 scottmac Exp $ */
+/* $Id: openssl.c,v 1.181 2009/04/20 09:43:45 mkoppanen Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -4628,6 +4628,7 @@
char *cipherlist = NULL;
int ok = 1;
+ ERR_clear_error();
/* look at context options in the stream and set appropriate
verification flags */
if (GET_VER_OPT("verify_peer") && zval_is_true(*val)) {
--
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) / NEWS
mkoppanen Sat Apr 11 12:46:32 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: Added news entry about the 'n' flag http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.555&r2=1.2027.2.547.2.965.2.556&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.555 php-src/NEWS:1.2027.2.547.2.965.2.556 --- php-src/NEWS:1.2027.2.547.2.965.2.555 Fri Apr 10 15:50:15 2009 +++ php-src/NEWSSat Apr 11 12:46:31 2009 @@ -3,6 +3,8 @@ ?? ??? 200?, PHP 5.3.0 RC 2 - Undeprecated ticks. (Arnaud) - Upgraded bundled sqlite to version 3.6.12. (Scott) +- Added 'n' flag to fopen to allow passing O_NONBLOCK to the underlying + open(2) system call. (Mikko) - Fixed bug #47880 (crashes in call_user_func_array()). (Dmitry) - Fixed bug #47856 (stristr() converts needle to lower-case). (Ilia) -- 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/streams plain_wrapper.c
mkoppanen Sat Apr 11 11:44:15 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main/streams plain_wrapper.c
Log:
MFH: Added support for passing O_NONBLOCK to the underlying open() system call
http://cvs.php.net/viewvc.cgi/php-src/main/streams/plain_wrapper.c?r1=1.52.2.6.2.23.2.13&r2=1.52.2.6.2.23.2.14&diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.52.2.6.2.23.2.13
php-src/main/streams/plain_wrapper.c:1.52.2.6.2.23.2.14
--- php-src/main/streams/plain_wrapper.c:1.52.2.6.2.23.2.13 Tue Feb 10
16:14:18 2009
+++ php-src/main/streams/plain_wrapper.cSat Apr 11 11:44:15 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: plain_wrapper.c,v 1.52.2.6.2.23.2.13 2009/02/10 16:14:18 iliaa Exp $ */
+/* $Id: plain_wrapper.c,v 1.52.2.6.2.23.2.14 2009/04/11 11:44:15 mkoppanen Exp
$ */
#include "php.h"
#include "php_globals.h"
@@ -70,7 +70,11 @@
/* unknown mode */
return FAILURE;
}
-
+#if defined(O_NONBLOCK)
+ if (strchr(mode, 'n')) {
+ flags |= O_NONBLOCK;
+ }
+#endif
if (strchr(mode, '+')) {
flags |= O_RDWR;
} else if (flags) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams plain_wrapper.c
mkoppanen Sat Apr 11 11:44:06 2009 UTC
Modified files:
/php-src/main/streams plain_wrapper.c
Log:
Added support for passing O_NONBLOCK to the underlying open() system call
http://cvs.php.net/viewvc.cgi/php-src/main/streams/plain_wrapper.c?r1=1.101&r2=1.102&diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.101
php-src/main/streams/plain_wrapper.c:1.102
--- php-src/main/streams/plain_wrapper.c:1.101 Tue Mar 10 23:40:01 2009
+++ php-src/main/streams/plain_wrapper.cSat Apr 11 11:44:06 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: plain_wrapper.c,v 1.101 2009/03/10 23:40:01 helly Exp $ */
+/* $Id: plain_wrapper.c,v 1.102 2009/04/11 11:44:06 mkoppanen Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -67,7 +67,11 @@
/* unknown mode */
return FAILURE;
}
-
+#if defined(O_NONBLOCK)
+ if (strchr(mode, 'n')) {
+ flags |= O_NONBLOCK;
+ }
+#endif
if (strchr(mode, '+')) {
flags |= O_RDWR;
} else if (flags) {
--
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
mkoppanen Mon Mar 16 12:03:58 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: Updated news file http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1438&r2=1.2027.2.547.2.1439&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1438 php-src/NEWS:1.2027.2.547.2.1439 --- php-src/NEWS:1.2027.2.547.2.1438Sat Mar 14 17:48:41 2009 +++ php-src/NEWSMon Mar 16 12:03:57 2009 @@ -6,6 +6,7 @@ - Fixed memory corruptions while reading properties of zip files. (Ilia) +- Fixed bug #47667 (ZipArchive::OVERWRITE seems to have no effect). (Mikko,Pierre) - Fixed bug #47639 (pg_copy_from() WARNING: nonstandard use of \\ in a string literal). (Ilia) - Fixed bug #47598 (FILTER_VALIDATE_EMAIL is locale aware). (Ilia) -- 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/zip/lib zip_open.c /ext/zip/tests bug47667.phpt
mkoppanen Mon Mar 16 10:22:13 2009 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/zip/tests bug47667.phpt
Modified files:
/php-src/ext/zip/libzip_open.c
Log:
Closes bug #47667
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_open.c?r1=1.1.2.11&r2=1.1.2.12&diff_format=u
Index: php-src/ext/zip/lib/zip_open.c
diff -u php-src/ext/zip/lib/zip_open.c:1.1.2.11
php-src/ext/zip/lib/zip_open.c:1.1.2.12
--- php-src/ext/zip/lib/zip_open.c:1.1.2.11 Thu Jan 1 19:32:45 2009
+++ php-src/ext/zip/lib/zip_open.c Mon Mar 16 10:22:13 2009
@@ -65,6 +65,10 @@
struct zip_cdir *cdir;
int i;
off_t len;
+
+if (flags & ZIP_OVERWRITE) {
+ return _zip_allocate_new(fn, zep);
+}
switch (_zip_file_exists(fn, flags, zep)) {
case -1:
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/bug47667.phpt?view=markup&rev=1.1
Index: php-src/ext/zip/tests/bug47667.phpt
+++ php-src/ext/zip/tests/bug47667.phpt
--TEST--
Bug #47667 (ZipArchive::OVERWRITE seems to have no effect)
--SKIPIF--
--FILE--
open($filename, ZipArchive::CREATE) !== true) {
exit("Unable to open the zip file");
} else {
$zip->addFromString('foo.txt', 'foo bar foobar');
$zip->close();
}
for ($i = 0; $i < 10; $i++) {
$zip = new ZipArchive();
if ($zip->open($filename, ZipArchive::OVERWRITE) !== true) {
exit("Unable to open the zip file");
}
$zip->addFromString("foo_{$i}.txt", 'foo bar foobar');
$zip->close();
}
$zip = new ZipArchive();
if ($zip->open($filename, ZipArchive::CREATE) !== true) {
exit("Unable to open the zip file");
}
echo "files: " , $zip->numFiles;
unlink($filename);
--EXPECT--
files: 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/zip/lib zip_open.c /ext/zip/tests bug47667.phpt
mkoppanen Mon Mar 16 10:19:43 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/zip/tests bug47667.phpt
Modified files:
/php-src/ext/zip/libzip_open.c
Log:
Closes bug #47667
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_open.c?r1=1.1.2.4.2.6&r2=1.1.2.4.2.7&diff_format=u
Index: php-src/ext/zip/lib/zip_open.c
diff -u php-src/ext/zip/lib/zip_open.c:1.1.2.4.2.6
php-src/ext/zip/lib/zip_open.c:1.1.2.4.2.7
--- php-src/ext/zip/lib/zip_open.c:1.1.2.4.2.6 Fri Jan 2 00:07:57 2009
+++ php-src/ext/zip/lib/zip_open.c Mon Mar 16 10:19:43 2009
@@ -66,6 +66,9 @@
int i;
off_t len;
+if (flags & ZIP_OVERWRITE) {
+ return _zip_allocate_new(fn, zep);
+}
switch (_zip_file_exists(fn, flags, zep)) {
case -1:
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/bug47667.phpt?view=markup&rev=1.1
Index: php-src/ext/zip/tests/bug47667.phpt
+++ php-src/ext/zip/tests/bug47667.phpt
--TEST--
Bug #47667 (ZipArchive::OVERWRITE seems to have no effect)
--SKIPIF--
--FILE--
open($filename, ZipArchive::CREATE) !== true) {
exit("Unable to open the zip file");
} else {
$zip->addFromString('foo.txt', 'foo bar foobar');
$zip->close();
}
for ($i = 0; $i < 10; $i++) {
$zip = new ZipArchive();
if ($zip->open($filename, ZipArchive::OVERWRITE) !== true) {
exit("Unable to open the zip file");
}
$zip->addFromString("foo_{$i}.txt", 'foo bar foobar');
$zip->close();
}
$zip = new ZipArchive();
if ($zip->open($filename, ZipArchive::CREATE) !== true) {
exit("Unable to open the zip file");
}
echo "files: " , $zip->numFiles;
unlink($filename);
--EXPECT--
files: 1
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zip/lib zip_open.c /ext/zip/tests bug47667.phpt
mkoppanen Mon Mar 16 10:16:16 2009 UTC
Added files:
/php-src/ext/zip/tests bug47667.phpt
Modified files:
/php-src/ext/zip/libzip_open.c
Log:
Closes bug #47667
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_open.c?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/zip/lib/zip_open.c
diff -u php-src/ext/zip/lib/zip_open.c:1.9 php-src/ext/zip/lib/zip_open.c:1.10
--- php-src/ext/zip/lib/zip_open.c:1.9 Fri Jan 2 00:22:21 2009
+++ php-src/ext/zip/lib/zip_open.c Mon Mar 16 10:16:16 2009
@@ -65,8 +65,11 @@
struct zip_cdir *cdir;
int i;
off_t len;
-
+if (flags & ZIP_OVERWRITE) {
+ return _zip_allocate_new(fn, zep);
+}
+
switch (_zip_file_exists(fn, flags, zep)) {
case -1:
if (!(flags & ZIP_OVERWRITE)) {
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/bug47667.phpt?view=markup&rev=1.1
Index: php-src/ext/zip/tests/bug47667.phpt
+++ php-src/ext/zip/tests/bug47667.phpt
--TEST--
Bug #47667 (ZipArchive::OVERWRITE seems to have no effect)
--SKIPIF--
--FILE--
open($filename, ZipArchive::CREATE) !== true) {
exit("Unable to open the zip file");
} else {
$zip->addFromString('foo.txt', 'foo bar foobar');
$zip->close();
}
for ($i = 0; $i < 10; $i++) {
$zip = new ZipArchive();
if ($zip->open($filename, ZipArchive::OVERWRITE) !== true) {
exit("Unable to open the zip file");
}
$zip->addFromString("foo_{$i}.txt", 'foo bar foobar');
$zip->close();
}
$zip = new ZipArchive();
if ($zip->open($filename, ZipArchive::CREATE) !== true) {
exit("Unable to open the zip file");
}
echo "files: " , $zip->numFiles;
unlink($filename);
--EXPECT--
files: 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/curl/tests bug46739.phpt
mkoppanen Fri Dec 5 11:21:44 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/curl/tests bug46739.phpt
Log:
Added test for bug #46739
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug46739.phpt?view=markup&rev=1.1
Index: php-src/ext/curl/tests/bug46739.phpt
+++ php-src/ext/curl/tests/bug46739.phpt
--TEST--
Test bug #46739
--FILE--
http://127.0.0.1:9/');
curl_exec($ch);
$info = curl_getinfo($ch);
echo (array_key_exists('content_type', $info)) ? "set" : "not set";
?>
--EXPECT--
set
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl/tests bug46739.phpt
mkoppanen Fri Dec 5 11:21:15 2008 UTC
Added files:
/php-src/ext/curl/tests bug46739.phpt
Log:
Added test for bug #46739
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug46739.phpt?view=markup&rev=1.1
Index: php-src/ext/curl/tests/bug46739.phpt
+++ php-src/ext/curl/tests/bug46739.phpt
--TEST--
Test bug #46739
--FILE--
http://127.0.0.1:9/');
curl_exec($ch);
$info = curl_getinfo($ch);
echo (array_key_exists('content_type', $info)) ? "set" : "not set";
?>
--EXPECT--
set
--
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
mkoppanen Thu Dec 4 13:17:28 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: Fixed #46739 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1347&r2=1.2027.2.547.2.1348&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1347 php-src/NEWS:1.2027.2.547.2.1348 --- php-src/NEWS:1.2027.2.547.2.1347Wed Dec 3 15:57:52 2008 +++ php-src/NEWSThu Dec 4 13:17:28 2008 @@ -1,6 +1,8 @@ PHPNEWS ||| ?? ??? 2009, PHP 5.2.8 +- Fixed bug #46739 (array returned by curl_getinfo should contain content_type key). + (Mikko) 04 Dec 2008, PHP 5.2.7 - Upgraded PCRE to version 7.8 (Fixes CVE-2008-2371) (Ilia) -- 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/curl interface.c
mkoppanen Thu Dec 4 13:13:41 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/curl interface.c
Log:
Fixes bug #46739
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.37&r2=1.62.2.14.2.38&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.37
php-src/ext/curl/interface.c:1.62.2.14.2.38
--- php-src/ext/curl/interface.c:1.62.2.14.2.37 Thu Nov 27 17:01:29 2008
+++ php-src/ext/curl/interface.cThu Dec 4 13:13:41 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.62.2.14.2.37 2008/11/27 17:01:29 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.38 2008/12/04 13:13:41 mkoppanen Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1770,6 +1770,11 @@
if (curl_easy_getinfo(ch->cp, CURLINFO_CONTENT_TYPE, &s_code)
== CURLE_OK) {
if (s_code != NULL) {
CAAS("content_type", s_code);
+ } else {
+ zval *retnull;
+ MAKE_STD_ZVAL(retnull);
+ ZVAL_NULL(retnull);
+ CAAZ("content_type", retnull);
}
}
if (curl_easy_getinfo(ch->cp, CURLINFO_HTTP_CODE, &l_code) ==
CURLE_OK) {
--
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/curl interface.c
mkoppanen Thu Dec 4 13:13:22 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/curl interface.c
Log:
Fixes bug #46739
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.22&r2=1.62.2.14.2.27.2.23&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.22
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.23
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.22Sun Nov 30 17:30:50 2008
+++ php-src/ext/curl/interface.cThu Dec 4 13:13:22 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.62.2.14.2.27.2.22 2008/11/30 17:30:50 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.23 2008/12/04 13:13:22 mkoppanen Exp $
*/
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1870,6 +1870,11 @@
if (curl_easy_getinfo(ch->cp, CURLINFO_CONTENT_TYPE, &s_code)
== CURLE_OK) {
if (s_code != NULL) {
CAAS("content_type", s_code);
+ } else {
+ zval *retnull;
+ MAKE_STD_ZVAL(retnull);
+ ZVAL_NULL(retnull);
+ CAAZ("content_type", retnull);
}
}
if (curl_easy_getinfo(ch->cp, CURLINFO_HTTP_CODE, &l_code) ==
CURLE_OK) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl interface.c
mkoppanen Thu Dec 4 13:12:49 2008 UTC
Modified files:
/php-src/ext/curl interface.c
Log:
Fixes bug #46739
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.136&r2=1.137&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.136 php-src/ext/curl/interface.c:1.137
--- php-src/ext/curl/interface.c:1.136 Sun Nov 30 17:35:56 2008
+++ php-src/ext/curl/interface.cThu Dec 4 13:12:49 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.136 2008/11/30 17:35:56 iliaa Exp $ */
+/* $Id: interface.c,v 1.137 2008/12/04 13:12:49 mkoppanen Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1929,6 +1929,11 @@
if (curl_easy_getinfo(ch->cp, CURLINFO_CONTENT_TYPE, &s_code)
== CURLE_OK) {
if (s_code != NULL) {
CAAS("content_type", s_code);
+ } else {
+ zval *retnull;
+ MAKE_STD_ZVAL(retnull);
+ ZVAL_NULL(retnull);
+ CAAZ("content_type", retnull);
}
}
if (curl_easy_getinfo(ch->cp, CURLINFO_HTTP_CODE, &l_code) ==
CURLE_OK) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard mail.c
> That Ilia's comment is bullshit. PHP_5_2 is not "critical fixes only" > branch. It's normal bug fix branch til the day PHP 5.3 is released. We can > reconsider it's status once there is 5.3.1 available. Committed, closed bug and updated NEWS. -- Mikko Koppanen -- 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/standard mail.c
mkoppanen Fri Oct 3 13:59:33 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/standard mail.c
Log:
Adds signal handling around popen/pclose in mail.c.
Related information on bugs #8992 and #14032
Original patch by D. Parthey
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1237&r2=1.2027.2.547.2.1238&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1237 php-src/NEWS:1.2027.2.547.2.1238
--- php-src/NEWS:1.2027.2.547.2.1237Thu Oct 2 03:41:24 2008
+++ php-src/NEWSFri Oct 3 13:59:32 2008
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? ??? 2008, PHP 5.2.7
+- Fixed bug #14032 (Mail() always returns false but mail is sent). (Mikko)
+
- Reverted fix for bug #44197 due to behaviour change in minor version.
(Felipe)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/mail.c?r1=1.87.2.1.2.9&r2=1.87.2.1.2.10&diff_format=u
Index: php-src/ext/standard/mail.c
diff -u php-src/ext/standard/mail.c:1.87.2.1.2.9
php-src/ext/standard/mail.c:1.87.2.1.2.10
--- php-src/ext/standard/mail.c:1.87.2.1.2.9Mon Dec 31 07:20:12 2007
+++ php-src/ext/standard/mail.c Fri Oct 3 13:59:33 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: mail.c,v 1.87.2.1.2.9 2007/12/31 07:20:12 sebastian Exp $ */
+/* $Id: mail.c,v 1.87.2.1.2.10 2008/10/03 13:59:33 mkoppanen Exp $ */
#include
#include
@@ -31,6 +31,12 @@
#include
#endif
+#if PHP_SIGCHILD
+#if HAVE_SIGNAL_H
+#include
+#endif
+#endif
+
#include "php_mail.h"
#include "php_ini.h"
#include "safe_mode.h"
@@ -200,6 +206,9 @@
int ret;
char *sendmail_path = INI_STR("sendmail_path");
char *sendmail_cmd = NULL;
+#if PHP_SIGCHILD
+ void (*sig_handler)() = NULL;
+#endif
if (!sendmail_path) {
#if (defined PHP_WIN32 || defined NETWARE)
@@ -224,6 +233,16 @@
sendmail_cmd = sendmail_path;
}
+#if PHP_SIGCHILD
+ /* Set signal handler of SIGCHLD to default to prevent other signal
handlers
+* from being called and reaping the return code when our child exits.
+* The original handler needs to be restored after pclose() */
+ sig_handler = (void *)signal(SIGCHLD, SIG_DFL);
+ if (sig_handler == SIG_ERR) {
+ sig_handler = NULL;
+ }
+#endif
+
#ifdef PHP_WIN32
sendmail = popen(sendmail_cmd, "wb");
#else
@@ -241,6 +260,13 @@
if (EACCES == errno) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Permission
denied: unable to execute shell to run mail delivery binary '%s'",
sendmail_path);
pclose(sendmail);
+#if PHP_SIGCHILD
+ /* Restore handler in case of error on Windows
+ Not sure if this applicable on Win but just in case.
*/
+ if (sig_handler) {
+ signal(SIGCHLD, sig_handler);
+ }
+#endif
return 0;
}
#endif
@@ -251,6 +277,12 @@
}
fprintf(sendmail, "\n%s\n", message);
ret = pclose(sendmail);
+#if PHP_SIGCHILD
+ if (sig_handler) {
+ signal(SIGCHLD, sig_handler);
+ }
+#endif
+
#ifdef PHP_WIN32
if (ret == -1)
#else
@@ -269,6 +301,11 @@
}
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute
mail delivery program '%s'", sendmail_path);
+#if PHP_SIGCHILD
+ if (sig_handler) {
+ signal(SIGCHLD, sig_handler);
+ }
+#endif
return 0;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard mail.c
On Fri, Oct 3, 2008 at 2:50 PM, Jani Taskinen <[EMAIL PROTECTED]> wrote: > It seems like a perfectly valid bug fix, how about merge to PHP_5_2 too? > (and close the bug #14032 too..) > > --Jani Hi, I will close the bug and update NEWS file. I am not sure about committing to PHP_5_2 after reading http://news.php.net/php.cvs/53337 -- Mikko Koppanen -- 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 mail.c
mkoppanen Fri Oct 3 13:32:42 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard mail.c
Log:
Adds signal handling around popen/pclose in mail.c.
Related information on bugs #8992 and #14032
Original patch by D. Parthey
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/mail.c?r1=1.87.2.1.2.7.2.3&r2=1.87.2.1.2.7.2.4&diff_format=u
Index: php-src/ext/standard/mail.c
diff -u php-src/ext/standard/mail.c:1.87.2.1.2.7.2.3
php-src/ext/standard/mail.c:1.87.2.1.2.7.2.4
--- php-src/ext/standard/mail.c:1.87.2.1.2.7.2.3Mon Dec 31 07:17:15 2007
+++ php-src/ext/standard/mail.c Fri Oct 3 13:32:41 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: mail.c,v 1.87.2.1.2.7.2.3 2007/12/31 07:17:15 sebastian Exp $ */
+/* $Id: mail.c,v 1.87.2.1.2.7.2.4 2008/10/03 13:32:41 mkoppanen Exp $ */
#include
#include
@@ -31,6 +31,12 @@
#include
#endif
+#if PHP_SIGCHILD
+#if HAVE_SIGNAL_H
+#include
+#endif
+#endif
+
#include "php_mail.h"
#include "php_ini.h"
#include "safe_mode.h"
@@ -193,6 +199,9 @@
int ret;
char *sendmail_path = INI_STR("sendmail_path");
char *sendmail_cmd = NULL;
+#if PHP_SIGCHILD
+ void (*sig_handler)() = NULL;
+#endif
if (!sendmail_path) {
#if (defined PHP_WIN32 || defined NETWARE)
@@ -217,6 +226,16 @@
sendmail_cmd = sendmail_path;
}
+#if PHP_SIGCHILD
+ /* Set signal handler of SIGCHLD to default to prevent other signal
handlers
+* from being called and reaping the return code when our child exits.
+* The original handler needs to be restored after pclose() */
+ sig_handler = (void *)signal(SIGCHLD, SIG_DFL);
+ if (sig_handler == SIG_ERR) {
+ sig_handler = NULL;
+ }
+#endif
+
#ifdef PHP_WIN32
sendmail = popen(sendmail_cmd, "wb");
#else
@@ -235,6 +254,13 @@
if (EACCES == errno) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Permission
denied: unable to execute shell to run mail delivery binary '%s'",
sendmail_path);
pclose(sendmail);
+#if PHP_SIGCHILD
+ /* Restore handler in case of error on Windows
+ Not sure if this applicable on Win but just in case.
*/
+ if (sig_handler) {
+ signal(SIGCHLD, sig_handler);
+ }
+#endif
return 0;
}
#endif
@@ -246,6 +272,12 @@
fprintf(sendmail, "\n%s\n", message);
ret = pclose(sendmail);
+#if PHP_SIGCHILD
+ if (sig_handler) {
+ signal(SIGCHLD, sig_handler);
+ }
+#endif
+
#ifdef PHP_WIN32
if (ret == -1)
#else
@@ -264,6 +296,11 @@
}
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute
mail delivery program '%s'", sendmail_path);
+#if PHP_SIGCHILD
+ if (sig_handler) {
+ signal(SIGCHLD, sig_handler);
+ }
+#endif
return 0;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard mail.c
mkoppanen Fri Oct 3 13:31:21 2008 UTC
Modified files:
/php-src/ext/standard mail.c
Log:
Adds signal handling around popen/pclose in mail.c.
Related information on bugs #8992 and #14032
Original patch by D. Parthey
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/mail.c?r1=1.97&r2=1.98&diff_format=u
Index: php-src/ext/standard/mail.c
diff -u php-src/ext/standard/mail.c:1.97 php-src/ext/standard/mail.c:1.98
--- php-src/ext/standard/mail.c:1.97Mon Dec 31 07:12:16 2007
+++ php-src/ext/standard/mail.c Fri Oct 3 13:31:21 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: mail.c,v 1.97 2007/12/31 07:12:16 sebastian Exp $ */
+/* $Id: mail.c,v 1.98 2008/10/03 13:31:21 mkoppanen Exp $ */
#include
#include
@@ -31,6 +31,12 @@
#include
#endif
+#if PHP_SIGCHILD
+#if HAVE_SIGNAL_H
+#include
+#endif
+#endif
+
#include "php_mail.h"
#include "php_ini.h"
#include "exec.h"
@@ -187,6 +193,9 @@
int ret;
char *sendmail_path = INI_STR("sendmail_path");
char *sendmail_cmd = NULL;
+#if PHP_SIGCHILD
+ void (*sig_handler)() = NULL;
+#endif
if (!sendmail_path) {
#if (defined PHP_WIN32 || defined NETWARE)
@@ -211,6 +220,16 @@
sendmail_cmd = sendmail_path;
}
+#if PHP_SIGCHILD
+ /* Set signal handler of SIGCHLD to default to prevent other signal
handlers
+* from being called and reaping the return code when our child exits.
+* The original handler needs to be restored after pclose() */
+ sig_handler = (void *)signal(SIGCHLD, SIG_DFL);
+ if (sig_handler == SIG_ERR) {
+ sig_handler = NULL;
+ }
+#endif
+
#ifdef PHP_WIN32
sendmail = popen(sendmail_cmd, "wb");
#else
@@ -229,6 +248,13 @@
if (EACCES == errno) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Permission
denied: unable to execute shell to run mail delivery binary '%s'",
sendmail_path);
pclose(sendmail);
+#if PHP_SIGCHILD
+ /* Restore handler in case of error on Windows
+ Not sure if this applicable on Win but just in case.
*/
+ if (sig_handler) {
+ signal(SIGCHLD, sig_handler);
+ }
+#endif
return 0;
}
#endif
@@ -240,6 +266,12 @@
fprintf(sendmail, "\n%s\n", message);
ret = pclose(sendmail);
+#if PHP_SIGCHILD
+ if (sig_handler) {
+ signal(SIGCHLD, sig_handler);
+ }
+#endif
+
#ifdef PHP_WIN32
if (ret == -1)
#else
@@ -258,6 +290,11 @@
}
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute
mail delivery program '%s'", sendmail_path);
+#if PHP_SIGCHILD
+ if (sig_handler) {
+ signal(SIGCHLD, sig_handler);
+ }
+#endif
return 0;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /sapi/cgi cgi_main.c /sapi/cgi/tests 010.phpt
On Tue, Sep 2, 2008 at 2:22 PM, Dmitry Stogov <[EMAIL PROTECTED]> wrote: > dmitry Tue Sep 2 13:22:16 2008 UTC > > Added files: (Branch: PHP_5_3) >/php-src/sapi/cgi/tests 010.phpt > > Modified files: >/php-src/sapi/cgi cgi_main.c > Log: > Fixed bug #45860 (header() function fails to correctly replace all Status > lines) > > Hello, I was checking the same issue a bit myself and noticed one edge case where this fix might be slightly unintuitive: # cat test.php # /opt/php/branches/5_3/bin/php-cgi test.php Status: 404 Not found X-Powered-By: PHP/5.3.0alpha3-dev Content-type: text/html # cat test2.php # /opt/php/branches/5_3/bin/php-cgi test2.php Status: 403 Forbidden X-Powered-By: PHP/5.3.0alpha3-dev Content-type: text/html The question in here is: Should explicit Status: header override the status code and message given in HTTP/ header? -- Mikko Koppanen -- 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) / NEWS
mkoppanen Sun Aug 31 17:05:13 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: Removed fileinfo related according to Jani's request http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.299&r2=1.2027.2.547.2.965.2.300&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.299 php-src/NEWS:1.2027.2.547.2.965.2.300 --- php-src/NEWS:1.2027.2.547.2.965.2.299 Sun Aug 31 15:04:21 2008 +++ php-src/NEWSSun Aug 31 17:05:12 2008 @@ -3,9 +3,6 @@ ?? ??? 200?, PHP 5.3.0 Alpha 2 - Removed special treatment of "/tmp" path for sessions in open_basedir context, which was introduced in 5.2.2, but was never documented. (Alexey) -- Changed bundled libmagic to use PHP memory allocation routines. (Ilia) -- Changed bundled libmagic to use pcre instead of ereg. (Derick, Scott, Mikko) -- Updated mime_content_type to use fileinfo. (Derick) - Removed shebang line check from CGI sapi (it is checked by scanner). (Dmitry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
On Sun, Aug 31, 2008 at 5:53 PM, Jani Taskinen <[EMAIL PROTECTED]> wrote: > Quite pointless entries, this thing was never in any release, who cares what > happened during development of it? Think f.e. if all changes done for the > namespace crap was added in the NEWS.. > > Short version: Please remove these pointless entries. These changes happened after alpha1 and before upcoming alpha2. I thought those changes were to be logged into NEWS. Removed the entries, sorry for the noise! -- Mikko Koppanen -- 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) / NEWS
mkoppanen Sun Aug 31 10:20:59 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: Changed name,name,name to name, name, name according to Pierre's advice http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.296&r2=1.2027.2.547.2.965.2.297&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.296 php-src/NEWS:1.2027.2.547.2.965.2.297 --- php-src/NEWS:1.2027.2.547.2.965.2.296 Sun Aug 31 10:06:46 2008 +++ php-src/NEWSSun Aug 31 10:20:57 2008 @@ -2,7 +2,7 @@ ||| ?? ??? 200?, PHP 5.3.0 Alpha 2 - Changed bundled libmagic to use PHP memory allocation routines. (Ilia) -- Changed bundled libmagic to use pcre instead of ereg. (Derick,Scott,Mikko) +- Changed bundled libmagic to use pcre instead of ereg. (Derick, Scott, Mikko) - Updated mime_content_type to use fileinfo. (Derick) - Removed shebang line check from CGI sapi (it is checked by scanner). (Dmitry) -- 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) / NEWS
mkoppanen Sun Aug 31 10:06:47 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: Added news entries about changes in ext/fileinfo http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.295&r2=1.2027.2.547.2.965.2.296&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.295 php-src/NEWS:1.2027.2.547.2.965.2.296 --- php-src/NEWS:1.2027.2.547.2.965.2.295 Fri Aug 29 14:59:19 2008 +++ php-src/NEWSSun Aug 31 10:06:46 2008 @@ -1,6 +1,10 @@ PHPNEWS ||| ?? ??? 200?, PHP 5.3.0 Alpha 2 +- Changed bundled libmagic to use PHP memory allocation routines. (Ilia) +- Changed bundled libmagic to use pcre instead of ereg. (Derick,Scott,Mikko) +- Updated mime_content_type to use fileinfo. (Derick) + - Removed shebang line check from CGI sapi (it is checked by scanner). (Dmitry) - Changed session_start() to return false when session startup fails. (Jani) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
