[PHP-CVS] svn: /php/php-src/trunk/ext/standard/ head.c
iliaaTue, 10 Aug 2010 00:19:51 +
Revision: http://svn.php.net/viewvc?view=revision&revision=302052
Log:
Make http_response_code() return FALSE where data is not available (Ex. cli
sapi)
Changed paths:
U php/php-src/trunk/ext/standard/head.c
Modified: php/php-src/trunk/ext/standard/head.c
===
--- php/php-src/trunk/ext/standard/head.c 2010-08-09 21:40:58 UTC (rev
302051)
+++ php/php-src/trunk/ext/standard/head.c 2010-08-10 00:19:51 UTC (rev
302052)
@@ -289,6 +289,10 @@
return;
}
+ if (!SG(sapi_headers).http_response_code) {
+ RETURN_FALSE;
+ }
+
RETURN_LONG(SG(sapi_headers).http_response_code);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/tags/ oci8-1.4.3/CREDITS oci8-1.4.3/README oci8-1.4.3/config.m4 oci8-1.4.3/config.w32 oci8-1.4.3/oci8.c oci8-1.4.3/oci8.dsp oci8-1.4.3/oci8_collection.c oci8-1.4.3/o
On Tue, Aug 10, 2010 at 1:00 AM, Christopher Jones wrote: > I've been keeping OCI8 releases in sync with PHP (and not tagging them). > This > tag is for a rare off-cycle release for a fix that was deferred from 5.3.3. > > Are you suggesting some svn externals set up - i.e. complicating the > whole svn environment? Well, it looks like I'm either not clear or you forgot the initial reason for this discussion (as you just created one here). Extension specific tags are not allowed in php-src. To still be able to have tags for your releases, I would suggest to maintain the released code in pecl/oci and create the tags/branches there. Cheers, -- Pierre @pierrejoye | http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/tags/ oci8-1.4.3/CREDITS oci8-1.4.3/README oci8-1.4.3/config.m4 oci8-1.4.3/config.w32 oci8-1.4.3/oci8.c oci8-1.4.3/oci8.dsp oci8-1.4.3/oci8_collection.c oci8-1.4.3/o
On 08/09/2010 03:08 PM, Pierre Joye wrote: On Tue, Aug 10, 2010 at 12:04 AM, Christopher Jones wrote: It was only in PECL (as a link into phpsrc) during the CVS days. Yes, but it still has different release cycles. My suggestion is to do the releases tags in PECL from now on. Cheers, I've been keeping OCI8 releases in sync with PHP (and not tagging them). This tag is for a rare off-cycle release for a fix that was deferred from 5.3.3. Are you suggesting some svn externals set up - i.e. complicating the whole svn environment? Chris -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ Free PHP Book: http://tinyurl.com/ugpomhome -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/tags/ oci8-1.4.3/CREDITS oci8-1.4.3/README oci8-1.4.3/config.m4 oci8-1.4.3/config.w32 oci8-1.4.3/oci8.c oci8-1.4.3/oci8.dsp oci8-1.4.3/oci8_collection.c oci8-1.4.3/o
On Tue, Aug 10, 2010 at 12:04 AM, Christopher Jones wrote: > > It was only in PECL (as a link into phpsrc) during the CVS days. Yes, but it still has different release cycles. My suggestion is to do the releases tags in PECL from now on. Cheers, -- Pierre @pierrejoye | http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/tags/ oci8-1.4.3/CREDITS oci8-1.4.3/README oci8-1.4.3/config.m4 oci8-1.4.3/config.w32 oci8-1.4.3/oci8.c oci8-1.4.3/oci8.dsp oci8-1.4.3/oci8_collection.c oci8-1.4.3/o
It was only in PECL (as a link into phpsrc) during the CVS days. Chris On 08/09/2010 11:34 AM, Pierre Joye wrote: hi, well, it is not as it is released under pecl too. So I would suggest to actually do the tags in a pecl/oci* repo only. Cheers, On Mon, Aug 9, 2010 at 8:28 PM, Christopher Jones wrote: On 08/09/2010 02:22 AM, Derick Rethans wrote: On Mon, 9 Aug 2010, Adam Harvey wrote: On 7 August 2010 08:28, Christopher Joneswrote: sixd Sat, 07 Aug 2010 00:28:09 + Revision: http://svn.php.net/viewvc?view=revision&revision=301961 Log: Tagging the 1.4.3 release Changed paths: A php/php-src/tags/oci8-1.4.3/ Should we be tagging oci8 releases within the php-src tags directory? (Not a rhetorical question; I'm genuinely unsure. It doesn't really feel right, but I may have missed a discussion.) No, we should not. Derick Adam, There wasn't any discussion - until now. OCI8 is only developed in php-src. Chris -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ Free PHP Book: http://tinyurl.com/ugpomhome -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ Free PHP Book: http://tinyurl.com/ugpomhome -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/tags/ oci8-1.4.3/CREDITS oci8-1.4.3/README oci8-1.4.3/config.m4 oci8-1.4.3/config.w32 oci8-1.4.3/oci8.c oci8-1.4.3/oci8.dsp oci8-1.4.3/oci8_collection.c oci8-1.4.3/o
hi, well, it is not as it is released under pecl too. So I would suggest to actually do the tags in a pecl/oci* repo only. Cheers, On Mon, Aug 9, 2010 at 8:28 PM, Christopher Jones wrote: > > > On 08/09/2010 02:22 AM, Derick Rethans wrote: >> >> On Mon, 9 Aug 2010, Adam Harvey wrote: >> >>> On 7 August 2010 08:28, Christopher Jones wrote: sixd Sat, 07 Aug 2010 00:28:09 + Revision: http://svn.php.net/viewvc?view=revision&revision=301961 Log: Tagging the 1.4.3 release Changed paths: A php/php-src/tags/oci8-1.4.3/ >>> >>> Should we be tagging oci8 releases within the php-src tags directory? >>> (Not a rhetorical question; I'm genuinely unsure. It doesn't really >>> feel right, but I may have missed a discussion.) >> >> No, we should not. >> >> Derick >> >> > > Adam, > > There wasn't any discussion - until now. OCI8 is only developed in php-src. > > Chris > > -- > Email: christopher.jo...@oracle.com > Tel: +1 650 506 8630 > Blog: http://blogs.oracle.com/opal/ > Free PHP Book: http://tinyurl.com/ugpomhome > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > > -- Pierre @pierrejoye | http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/tags/ oci8-1.4.3/CREDITS oci8-1.4.3/README oci8-1.4.3/config.m4 oci8-1.4.3/config.w32 oci8-1.4.3/oci8.c oci8-1.4.3/oci8.dsp oci8-1.4.3/oci8_collection.c oci8-1.4.3/o
On 08/09/2010 02:22 AM, Derick Rethans wrote: On Mon, 9 Aug 2010, Adam Harvey wrote: On 7 August 2010 08:28, Christopher Jones wrote: sixd Sat, 07 Aug 2010 00:28:09 + Revision: http://svn.php.net/viewvc?view=revision&revision=301961 Log: Tagging the 1.4.3 release Changed paths: A php/php-src/tags/oci8-1.4.3/ Should we be tagging oci8 releases within the php-src tags directory? (Not a rhetorical question; I'm genuinely unsure. It doesn't really feel right, but I may have missed a discussion.) No, we should not. Derick Adam, There wasn't any discussion - until now. OCI8 is only developed in php-src. Chris -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ Free PHP Book: http://tinyurl.com/ugpomhome -- 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/mysqlnd/mysqlnd_result.c trunk/ext/mysqlnd/mysqlnd_result.c
andrey Mon, 09 Aug 2010 17:29:30 +
Revision: http://svn.php.net/viewvc?view=revision&revision=302045
Log:
Fix Request #52302 mysqli_fetch_all does not work with MYSQLI_USE_RESULT
Bug: http://bugs.php.net/52302 (Assigned) mysqli_fetch_all does not work with
MYSQLI_USE_RESULT
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2010-08-09 17:16:43 UTC (rev 302044)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-08-09 17:29:30 UTC (rev 302045)
@@ -13,6 +13,8 @@
empty). (Felipe)
- Fixed bug #52436 (Compile error if systems do not have stdint.h)
(Sriram Natarajan)
+- Fixed bug #52302 (mysqli_fetch_all does not work with MYSQLI_USE_RESULT).
+ (Andrey).
- Fixed bug #51610 (Using oci_connect causes PHP to take a long time to
exit). Requires Oracle bug fix 9891199 for this patch to have an
effect. (Oracle Corp.)
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2010-08-09
17:16:43 UTC (rev 302044)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2010-08-09
17:29:30 UTC (rev 302045)
@@ -1567,8 +1567,7 @@
DBG_ENTER("mysqlnd_res::fetch_all");
DBG_INF_FMT("flags=%u", flags);
- /* mysqlnd_res::fetch_all works with buffered resultsets only */
- if (result->unbuf || (!result->unbuf && !set)) {
+ if ((!result->unbuf && !set)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "fetch_all can be
used only with buffered sets");
if (result->conn) {
SET_CLIENT_ERROR(result->conn->error_info,
CR_NOT_IMPLEMENTED, UNKNOWN_SQLSTATE, "fetch_all can be used only with buffered
sets");
@@ -1577,19 +1576,17 @@
DBG_VOID_RETURN;
}
- mysqlnd_array_init(return_value, (unsigned int) set->row_count);
+ mysqlnd_array_init(return_value, (unsigned int) set? set->row_count :
4); /* 4 is a magic value */
- if (!set->row_count || !set->data_cursor || set->data_cursor >=
set->data + set->row_count) {
- DBG_VOID_RETURN;
- }
-
- while (set->data_cursor &&
- (set->data_cursor - set->data) < (set->row_count *
result->meta->field_count))
- {
+ do {
MAKE_STD_ZVAL(row);
mysqlnd_fetch_into(result, flags, row, MYSQLND_MYSQLI);
+ if (Z_TYPE_P(row) != IS_ARRAY) {
+ zval_ptr_dtor(&row);
+ break;
+ }
add_index_zval(return_value, i++, row);
- }
+ } while (1);
DBG_VOID_RETURN;
}
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c 2010-08-09 17:16:43 UTC
(rev 302044)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c 2010-08-09 17:29:30 UTC
(rev 302045)
@@ -1567,8 +1567,7 @@
DBG_ENTER("mysqlnd_res::fetch_all");
DBG_INF_FMT("flags=%u", flags);
- /* mysqlnd_res::fetch_all works with buffered resultsets only */
- if (result->unbuf || (!result->unbuf && !set)) {
+ if ((!result->unbuf && !set)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "fetch_all can be
used only with buffered sets");
if (result->conn) {
SET_CLIENT_ERROR(result->conn->error_info,
CR_NOT_IMPLEMENTED, UNKNOWN_SQLSTATE, "fetch_all can be used only with buffered
sets");
@@ -1577,19 +1576,17 @@
DBG_VOID_RETURN;
}
- mysqlnd_array_init(return_value, (unsigned int) set->row_count);
+ mysqlnd_array_init(return_value, (unsigned int) set? set->row_count :
4); /* 4 is a magic value */
- if (!set->row_count || !set->data_cursor || set->data_cursor >=
set->data + set->row_count) {
- DBG_VOID_RETURN;
- }
-
- while (set->data_cursor &&
- (set->data_cursor - set->data) < (set->row_count *
result->meta->field_count))
- {
+ do {
MAKE_STD_ZVAL(row);
mysqlnd_fetch_into(result, flags, row, MYSQLND_MYSQLI);
+ if (Z_TYPE_P(row) != IS_ARRAY) {
+ zval_ptr_dtor(&row);
+ break;
+ }
add_index_zval(return_value, i++, row);
- }
+ } while (1);
DBG_VOID_RETURN;
}
--
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/mysqlnd/mysqlnd.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h trunk/ext/mysqlnd/mysqlnd.c trunk/e
andrey Mon, 09 Aug 2010 17:01:57 +
Revision: http://svn.php.net/viewvc?view=revision&revision=302043
Log:
Lay foundations for named pipe support in mysqlnd
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2010-08-09 16:55:48 UTC
(rev 302042)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2010-08-09 17:01:57 UTC
(rev 302043)
@@ -2116,10 +2116,17 @@
DBG_INF_FMT("charset=%s", conn->options.charset_name);
break;
}
+ case MYSQL_OPT_NAMED_PIPE:
+ conn->options.protocol = MYSQL_PROTOCOL_PIPE;
+ break;
+ case MYSQL_OPT_PROTOCOL:
+ if (*(unsigned int*) value < MYSQL_PROTOCOL_LAST) {
+ conn->options.protocol = *(unsigned int*) value;
+ }
+ break;
#ifdef WHEN_SUPPORTED_BY_MYSQLI
case MYSQL_SET_CHARSET_DIR:
case MYSQL_OPT_RECONNECT:
- case MYSQL_OPT_PROTOCOL:
/* we don't need external character sets, all character
sets are
compiled in. For compatibility we just ignore this
setting.
Same for protocol, we don't support old protocol */
@@ -2131,7 +2138,6 @@
#endif
#ifdef WHEN_SUPPORTED_BY_MYSQLI
- case MYSQL_OPT_NAMED_PIPE:
case MYSQL_SHARED_MEMORY_BASE_NAME:
case MYSQL_OPT_USE_RESULT:
case MYSQL_SECURE_AUTH:
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h
2010-08-09 16:55:48 UTC (rev 302042)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h
2010-08-09 17:01:57 UTC (rev 302043)
@@ -168,6 +168,15 @@
MYSQLND_OPT_SSL_PASSPHRASE = 209
} enum_mysqlnd_option;
+typedef enum mysqlnd_protocol_type
+{
+ MYSQL_PROTOCOL_DEFAULT = 0,
+ MYSQL_PROTOCOL_TCP, /* all, supported */
+ MYSQL_PROTOCOL_SOCKET, /* unix, supported */
+ MYSQL_PROTOCOL_PIPE,/* win32, not-supported */
+ MYSQL_PROTOCOL_MEMORY, /* win32, not-supported */
+ MYSQL_PROTOCOL_LAST
+} enum_mysqlnd_protocol_type;
typedef enum mysqlnd_field_types
{
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h 2010-08-09
16:55:48 UTC (rev 302042)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h 2010-08-09
17:01:57 UTC (rev 302043)
@@ -161,7 +161,7 @@
char* unused3;
char* unused4;
char* unused5;
- zend_bool unused6;
+ enum_mysqlnd_protocol_type protocol;
char*charset_name;
/* maximum allowed packet size for communication */
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2010-08-09 16:55:48 UTC (rev
302042)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2010-08-09 17:01:57 UTC (rev
302043)
@@ -2116,10 +2116,17 @@
DBG_INF_FMT("charset=%s", conn->options.charset_name);
break;
}
+ case MYSQL_OPT_NAMED_PIPE:
+ conn->options.protocol = MYSQL_PROTOCOL_PIPE;
+ break;
+ case MYSQL_OPT_PROTOCOL:
+ if (*(unsigned int*) value < MYSQL_PROTOCOL_LAST) {
+ conn->options.protocol = *(unsigned int*) value;
+ }
+ break;
#ifdef WHEN_SUPPORTED_BY_MYSQLI
case MYSQL_SET_CHARSET_DIR:
case MYSQL_OPT_RECONNECT:
- case MYSQL_OPT_PROTOCOL:
/* we don't need external character sets, all character
sets are
compiled in. For compatibility we just ignore this
setting.
Same for protocol, we don't support old protocol */
@@ -2131,7 +2138,6 @@
#endif
#ifdef WHEN_SUPPORTED_BY_MYSQLI
- case MYSQL_OPT_NAMED_PIPE:
case MYSQL_SHARED_ME
[PHP-CVS] svn: /php/php-src/trunk/ UPGRADING
kalleMon, 09 Aug 2010 13:27:13 + Revision: http://svn.php.net/viewvc?view=revision&revision=302034 Log: Update UPGRADING Changed paths: U php/php-src/trunk/UPGRADING Modified: php/php-src/trunk/UPGRADING === --- php/php-src/trunk/UPGRADING 2010-08-09 13:10:32 UTC (rev 302033) +++ php/php-src/trunk/UPGRADING 2010-08-09 13:27:13 UTC (rev 302034) @@ -228,11 +228,12 @@ e. New functions - Core: + - get_declared_traits() + - http_response_code() f. New global constants - - Core: - - get_declared_traits() + - g. New classes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ NEWS ext/standard/basic_functions.c ext/standard/head.c ext/standard/head.h
kalleMon, 09 Aug 2010 13:10:32 +
Revision: http://svn.php.net/viewvc?view=revision&revision=302033
Log:
Implemented FR #52555 (Ability to get HTTP response code)
- Patch by Paul Dragoonis
Bug: http://bugs.php.net/52555 (Assigned) Headers_List not returning HTTP
Status Code
Changed paths:
U php/php-src/trunk/NEWS
U php/php-src/trunk/ext/standard/basic_functions.c
U php/php-src/trunk/ext/standard/head.c
U php/php-src/trunk/ext/standard/head.h
Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS 2010-08-09 11:22:09 UTC (rev 302032)
+++ php/php-src/trunk/NEWS 2010-08-09 13:10:32 UTC (rev 302033)
@@ -1,4 +1,4 @@
-PHPNEWS
+PHP
NEWS
|||
?? ??? 201?, PHP 5.3.99
- Upgraded bundled sqlite to version 3.6.23.1. (Ilia)
@@ -89,6 +89,7 @@
- Removed support for linking against MySQL client libraries older 4.1 from
PDO_mysql. (Johannes)
+- Implemented FR #52555 (Ability to get HTTP response code). (Paul Dragoonis)
- Implemented FR #51295 (SQLite3::busyTimeout not existing). (Mark)
- Implemented FR #48632 (OpenSSL AES support). (yonas dot y
at gmail dot com, Pierre)
Modified: php/php-src/trunk/ext/standard/basic_functions.c
===
--- php/php-src/trunk/ext/standard/basic_functions.c2010-08-09 11:22:09 UTC
(rev 302032)
+++ php/php-src/trunk/ext/standard/basic_functions.c2010-08-09 13:10:32 UTC
(rev 302033)
@@ -1470,6 +1470,9 @@
ZEND_BEGIN_ARG_INFO(arginfo_headers_list, 0)
ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO(arginfo_http_response_code, 0)
+ZEND_END_ARG_INFO()
/* }}} */
/* {{{ html.c */
ZEND_BEGIN_ARG_INFO_EX(arginfo_htmlspecialchars, 0, 0, 1)
@@ -2983,6 +2986,7 @@
PHP_FE(header_remove,
arginfo_header_remove)
PHP_FE(headers_sent,
arginfo_headers_sent)
PHP_FE(headers_list,
arginfo_headers_list)
+ PHP_FE(http_response_code,
arginfo_http_response_code)
PHP_FE(connection_aborted,
arginfo_connection_aborted)
PHP_FE(connection_status,
arginfo_connection_status)
Modified: php/php-src/trunk/ext/standard/head.c
===
--- php/php-src/trunk/ext/standard/head.c 2010-08-09 11:22:09 UTC (rev
302032)
+++ php/php-src/trunk/ext/standard/head.c 2010-08-09 13:10:32 UTC (rev
302033)
@@ -281,6 +281,18 @@
}
/* }}} */
+/* {{{ proto long http_response_code()
+ Returns the current HTTP response code */
+PHP_FUNCTION(http_response_code)
+{
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
+
+ RETURN_LONG(SG(sapi_headers).http_response_code);
+}
+/* }}} */
+
/*
* Local variables:
* tab-width: 4
Modified: php/php-src/trunk/ext/standard/head.h
===
--- php/php-src/trunk/ext/standard/head.h 2010-08-09 11:22:09 UTC (rev
302032)
+++ php/php-src/trunk/ext/standard/head.h 2010-08-09 13:10:32 UTC (rev
302033)
@@ -28,6 +28,7 @@
PHP_FUNCTION(setrawcookie);
PHP_FUNCTION(headers_sent);
PHP_FUNCTION(headers_list);
+PHP_FUNCTION(http_response_code);
PHPAPI int php_header(TSRMLS_D);
PHPAPI int php_setcookie(char *name, int name_len, char *value, int value_len,
time_t expires, char *path, int path_len, char *domain, int domain_len, int
secure, int url_encode, int httponly TSRMLS_DC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/tags/ oci8-1.4.3/CREDITS oci8-1.4.3/README oci8-1.4.3/config.m4 oci8-1.4.3/config.w32 oci8-1.4.3/oci8.c oci8-1.4.3/oci8.dsp oci8-1.4.3/oci8_collection.c oci8-1.4.3/o
On Mon, 9 Aug 2010, Adam Harvey wrote: > On 7 August 2010 08:28, Christopher Jones wrote: > > sixd Sat, 07 Aug 2010 00:28:09 + > > > > Revision: http://svn.php.net/viewvc?view=revision&revision=301961 > > > > Log: > > Tagging the 1.4.3 release > > > > Changed paths: > > A php/php-src/tags/oci8-1.4.3/ > > Should we be tagging oci8 releases within the php-src tags directory? > (Not a rhetorical question; I'm genuinely unsure. It doesn't really > feel right, but I may have missed a discussion.) No, we should not. Derick -- http://derickrethans.nl | http://xdebug.org Like Xdebug? Consider a donation: http://xdebug.org/donate.php twitter: @derickr and @xdebug -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/winutil.c trunk/win32/winutil.c
pajoye Mon, 09 Aug 2010 08:14:14 +
Revision: http://svn.php.net/viewvc?view=revision&revision=302024
Log:
- #52523, fix logic (0 is perfectly valid as part of the data, bin data)
Bug: http://bugs.php.net/52523 (Assigned) mcrypt_create_iv not reliable on win:
"Could not gather sufficient random data"
Changed paths:
U php/php-src/branches/PHP_5_3/win32/winutil.c
U php/php-src/trunk/win32/winutil.c
Modified: php/php-src/branches/PHP_5_3/win32/winutil.c
===
--- php/php-src/branches/PHP_5_3/win32/winutil.c2010-08-09 07:32:21 UTC
(rev 302023)
+++ php/php-src/branches/PHP_5_3/win32/winutil.c2010-08-09 08:14:14 UTC
(rev 302024)
@@ -70,13 +70,9 @@
ret = CryptGenRandom(hCryptProv, size, buf);
CryptReleaseContext(hCryptProv, 0);
if (ret) {
- while (i < size && buf[i] != 0) {
- i++;
- }
- if (i == size) {
- return SUCCESS;
- }
+ return SUCCESS;
+ } else {
+ return FAILURE;
}
- return FAILURE;
}
/* }}} */
Modified: php/php-src/trunk/win32/winutil.c
===
--- php/php-src/trunk/win32/winutil.c 2010-08-09 07:32:21 UTC (rev 302023)
+++ php/php-src/trunk/win32/winutil.c 2010-08-09 08:14:14 UTC (rev 302024)
@@ -70,12 +70,7 @@
ret = CryptGenRandom(hCryptProv, size, buf);
CryptReleaseContext(hCryptProv, 0);
if (ret) {
- while (i < size && buf[i] != 0) {
- i++;
- }
- if (i == size) {
- return SUCCESS;
- }
+ return SUCCESS;
}
return FAILURE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/winutil.c trunk/win32/winutil.c
pajoye Mon, 09 Aug 2010 07:32:21 +
Revision: http://svn.php.net/viewvc?view=revision&revision=302023
Log:
- WS
Changed paths:
U php/php-src/branches/PHP_5_3/win32/winutil.c
U php/php-src/trunk/win32/winutil.c
Modified: php/php-src/branches/PHP_5_3/win32/winutil.c
===
--- php/php-src/branches/PHP_5_3/win32/winutil.c2010-08-09 07:16:08 UTC
(rev 302022)
+++ php/php-src/branches/PHP_5_3/win32/winutil.c2010-08-09 07:32:21 UTC
(rev 302023)
@@ -76,7 +76,7 @@
if (i == size) {
return SUCCESS;
}
- }
+ }
return FAILURE;
}
/* }}} */
Modified: php/php-src/trunk/win32/winutil.c
===
--- php/php-src/trunk/win32/winutil.c 2010-08-09 07:16:08 UTC (rev 302022)
+++ php/php-src/trunk/win32/winutil.c 2010-08-09 07:32:21 UTC (rev 302023)
@@ -76,7 +76,7 @@
if (i == size) {
return SUCCESS;
}
- }
+ }
return FAILURE;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
