svn: /phpdoc/en/trunk/ appendices/wrappers.xml language/namespaces.xml reference/filesystem/functions/file-put-contents.xml
reference/mysqlnd/plugin.xml reference/stomp/stomp/construct.xml
| From: | Richard Quadling | Date: | Thu, 04 Nov 2010 13:32:52 +0000 |
| Subject: | svn: /phpdoc/en/trunk/ appendices/wrappers.xml language/namespaces.xml reference/filesystem/functions/file-put-contents.xml reference/mysqlnd/plugin.xml reference/stomp/stomp/construct.xml |
||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-7367@lists.php.net to get a copy of this message | ||
rquadling Thu, 04 Nov 2010 13:32:52 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=305081
Log:
Tabs to spaces (or removed if trailing)
Changed paths:
U phpdoc/en/trunk/appendices/wrappers.xml
U phpdoc/en/trunk/language/namespaces.xml
U phpdoc/en/trunk/reference/filesystem/functions/file-put-contents.xml
U phpdoc/en/trunk/reference/mysqlnd/plugin.xml
U phpdoc/en/trunk/reference/stomp/stomp/construct.xml
Modified: phpdoc/en/trunk/appendices/wrappers.xml
===================================================================
--- phpdoc/en/trunk/appendices/wrappers.xml 2010-11-04 13:18:40 UTC (rev 305080)
+++ phpdoc/en/trunk/appendices/wrappers.xml 2010-11-04 13:32:52 UTC (rev 305081)
@@ -442,12 +442,12 @@
<note>
<simpara>
A stream opened with <filename>php://input</filename> can only be read
- once; the stream does not support seek operations. However, depending
- on the SAPI implementation, it may be possible to open another
- <filename>php://input</filename> stream and restart reading. This is
- only possible if the request body data has been saved. Typically, this
- is the case for POST requests, but not other request methods, such as
- PUT or PROPFIND.
+ once; the stream does not support seek operations. However, depending
+ on the SAPI implementation, it may be possible to open another
+ <filename>php://input</filename> stream and restart reading. This is
+ only possible if the request body data has been saved. Typically, this
+ is the case for POST requests, but not other request methods, such as
+ PUT or PROPFIND.
</simpara>
</note>
<simpara>
Modified: phpdoc/en/trunk/language/namespaces.xml
===================================================================
--- phpdoc/en/trunk/language/namespaces.xml 2010-11-04 13:18:40 UTC (rev 305080)
+++ phpdoc/en/trunk/language/namespaces.xml 2010-11-04 13:32:52 UTC (rev 305081)
@@ -701,9 +701,9 @@
class Greenlandic
{
- use Languages\Danish;
+ use Languages\Danish;
- ...
+ ...
}
?>
]]>
Modified: phpdoc/en/trunk/reference/filesystem/functions/file-put-contents.xml
===================================================================
--- phpdoc/en/trunk/reference/filesystem/functions/file-put-contents.xml 2010-11-04 13:18:40 UTC
(rev 305080)
+++ phpdoc/en/trunk/reference/filesystem/functions/file-put-contents.xml 2010-11-04 13:32:52 UTC
(rev 305081)
@@ -64,7 +64,7 @@
<para>
The value of <parameter>flags</parameter> can be any combination of
the following flags, joined with the binary OR (<literal>|</literal>)
- operator.
+ operator.
</para>
<para>
<table>
Modified: phpdoc/en/trunk/reference/mysqlnd/plugin.xml
===================================================================
--- phpdoc/en/trunk/reference/mysqlnd/plugin.xml 2010-11-04 13:18:40 UTC (rev 305080)
+++ phpdoc/en/trunk/reference/mysqlnd/plugin.xml 2010-11-04 13:32:52 UTC (rev 305081)
@@ -485,11 +485,11 @@
void minit_register_hooks(TSRMLS_D) {
/* active function table */
struct st_mysqlnd_conn_methods * current_methods
- = mysqlnd_conn_get_methods();
+ = mysqlnd_conn_get_methods();
/* backup original function table */
memcpy(&org_methods, current_methods,
- sizeof(struct st_mysqlnd_conn_methods);
+ sizeof(struct st_mysqlnd_conn_methods);
/* install new methods */
current_methods->query = MYSQLND_METHOD(my_conn_class, query);
@@ -609,10 +609,10 @@
static MY_CONN_PROPERTIES** get_conn_properties(const MYSQLND *conn TSRMLS_DC) {
MY_CONN_PROPERTIES** props;
props = (MY_CONN_PROPERTIES**)mysqlnd_plugin_get_plugin_connection_data(
- conn, my_plugin_id);
+ conn, my_plugin_id);
if (!props || !(*props)) {
- *props = mnd_pecalloc(1, sizeof(MY_CONN_PROPERTIES), conn->persistent);
- (*props)->query_counter = 0;
+ *props = mnd_pecalloc(1, sizeof(MY_CONN_PROPERTIES), conn->persistent);
+ (*props)->query_counter = 0;
}
return props;
}
@@ -1174,7 +1174,7 @@
conn_m = mysqlnd_get_conn_methods();
memcpy(org_conn_m, conn_m,
- sizeof(struct st_mysqlnd_conn_methods));
+ sizeof(struct st_mysqlnd_conn_methods));
conn_m->query = MYSQLND_METHOD(mysqlnd_plugin_conn, query);
conn_m->connect = MYSQLND_METHOD(mysqlnd_plugin_conn, connect);
@@ -1330,13 +1330,13 @@
enum_func_status ret = FAIL;
zval * global_user_conn_proxy = fetch_userspace_proxy();
if (global_user_conn_proxy) {
- /* call userspace proxy */
- ret = MY_ZEND_CALL_METHOD_WRAPPER(global_user_conn_proxy, host, /*...*/);
+ /* call userspace proxy */
+ ret = MY_ZEND_CALL_METHOD_WRAPPER(global_user_conn_proxy, host, /*...*/);
} else {
- /* or original mysqlnd method = do nothing, be transparent */
- ret = org_methods.connect(conn, host, user, passwd,
- passwd_len, db, db_len, port,
- socket, mysql_flags TSRMLS_CC);
+ /* or original mysqlnd method = do nothing, be transparent */
+ ret = org_methods.connect(conn, host, user, passwd,
+ passwd_len, db, db_len, port,
+ socket, mysql_flags TSRMLS_CC);
}
return ret;
}
@@ -1354,13 +1354,13 @@
/* ... */, const char *host, /* ...*/) {
/* ... */
if (global_user_conn_proxy) {
- /* ... */
- zval* zv_host;
- MAKE_STD_ZVAL(zv_host);
- ZVAL_STRING(zv_host, host, 1);
- MY_ZEND_CALL_METHOD_WRAPPER(global_user_conn_proxy, zv_retval, zv_host /*, ...*/);
- zval_ptr_dtor(&zv_host);
- /* ... */
+ /* ... */
+ zval* zv_host;
+ MAKE_STD_ZVAL(zv_host);
+ ZVAL_STRING(zv_host, host, 1);
+ MY_ZEND_CALL_METHOD_WRAPPER(global_user_conn_proxy, zv_retval, zv_host /*, ...*/);
+ zval_ptr_dtor(&zv_host);
+ /* ... */
}
/* ... */
}
@@ -1378,12 +1378,12 @@
MYSQLND *conn, /* ...*/) {
/* ... */
if (global_user_conn_proxy) {
- /* ... */
- zval* zv_conn;
- ZEND_REGISTER_RESOURCE(zv_conn, (void *)conn, le_mysqlnd_plugin_conn);
- MY_ZEND_CALL_METHOD_WRAPPER(global_user_conn_proxy, zv_retval, zv_conn, zv_host /*, ...*/);
- zval_ptr_dtor(&zv_conn);
- /* ... */
+ /* ... */
+ zval* zv_conn;
+ ZEND_REGISTER_RESOURCE(zv_conn, (void *)conn, le_mysqlnd_plugin_conn);
+ MY_ZEND_CALL_METHOD_WRAPPER(global_user_conn_proxy, zv_retval, zv_conn, zv_host /*, ...*/);
+ zval_ptr_dtor(&zv_conn);
+ /* ... */
}
/* ... */
}
@@ -1408,17 +1408,17 @@
<![CDATA[
class proxy extends mysqlnd_plugin_connection {
public function connect($conn, $host, ...) {
- /* "pre" hook */
- printf("Connecting to host = '%s'\n", $host);
- debug_print_backtrace();
- return parent::connect($conn);
+ /* "pre" hook */
+ printf("Connecting to host = '%s'\n", $host);
+ debug_print_backtrace();
+ return parent::connect($conn);
}
public function query($conn, $query) {
- /* "post" hook */
- $ret = parent::query($conn, $query);
- printf("Query = '%s'\n", $query);
- return $ret;
+ /* "post" hook */
+ $ret = parent::query($conn, $query);
+ printf("Query = '%s'\n", $query);
+ return $ret;
}
}
mysqlnd_plugin_set_conn_proxy(new proxy());
@@ -1446,15 +1446,15 @@
MYSQLND* conn;
char* host; int host_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs",
- &mysqlnd_rsrc, &host, &host_len) == FAILURE) {
- RETURN_NULL();
+ &mysqlnd_rsrc, &host, &host_len) == FAILURE) {
+ RETURN_NULL();
}
ZEND_FETCH_RESOURCE(conn, MYSQLND* conn, &mysqlnd_rsrc, -1,
- "Mysqlnd Connection", le_mysqlnd_plugin_conn);
+ "Mysqlnd Connection", le_mysqlnd_plugin_conn);
if (PASS == org_methods.connect(conn, host, /* simplified! */ TSRMLS_CC))
- RETVAL_TRUE;
+ RETVAL_TRUE;
else
- RETVAL_FALSE;
+ RETVAL_FALSE;
}
]]>
</programlisting>
Modified: phpdoc/en/trunk/reference/stomp/stomp/construct.xml
===================================================================
--- phpdoc/en/trunk/reference/stomp/stomp/construct.xml 2010-11-04 13:18:40 UTC (rev 305080)
+++ phpdoc/en/trunk/reference/stomp/stomp/construct.xml 2010-11-04 13:32:52 UTC (rev 305081)
@@ -16,7 +16,7 @@
<methodparam
choice="opt"><type>string</type><parameter>broker</parameter><initializer>ini_get("stomp.default_broker_uri")</initializer></methodparam>
<methodparam
choice="opt"><type>string</type><parameter>username</parameter></methodparam>
<methodparam
choice="opt"><type>string</type><parameter>password</parameter></methodparam>
- <methodparam
choice="opt"><type>array</type><parameter>headers</parameter></methodparam>
+ <methodparam
choice="opt"><type>array</type><parameter>headers</parameter></methodparam>
</methodsynopsis>
<para>Procedural style:</para>
<methodsynopsis>