php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 17:22:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
81,588 Commits 547 Branches 1,481 Tags
caacaee6813da80f0803e311c47fa74c8a695daa
Commit Graph

682 Commits

Author SHA1 Message Date
Xinchen Hui
1db720cd6d Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/pgsql/pgsql.c
 2015-02-14 22:18:13 +08:00
Xinchen Hui
7667f8efc6 Fixed bug #68638 (pg_update() fails to store infinite values) 2015-02-14 22:17:01 +08:00
Xinchen Hui
40a94597ae Merge branch 'PHP-5.4' of https://github.com/wfelipew/php-src into PHP-5.5 2015-02-14 22:03:53 +08:00
William Felipe Welter
0421404b73 Fixed bug #68638 pg_update() fails to store infinite values 
Fix indent
 2015-02-12 23:39:54 -02:00
William Felipe Welter
60d5cdf137 Fixed bug #68638 pg_update() fails to store infinite values 
Check if value is "infinity" with strcasestr() to add quotes
 2015-02-09 20:35:18 -02:00
William Felipe Welter
bb3a81c4b4 Fixed bug #68638 pg_update() fails to store infinite values. 
Add quotes only if "infinity" values are received.
 2015-02-07 01:26:12 -02:00
William Felipe Welter
b64f149176 Test case Bug #68638 pg_update() fails to store infinite values 2015-02-05 13:19:52 -02:00
William Felipe Welter
cb3833a3be Fixed bug #68638 pg_update() fails to store infinite values. 
Regex to check float values changed to accept "infinity" values
and ignore case. Quotes are added to prevent syntax error on
PostgreSQL.
 2015-02-03 22:47:05 -02:00
Yasuo Ohgaki
36f73412c1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed Bug #65199 pg_copy_from() modifies input array variable
 2015-02-03 15:27:19 +09:00
Yasuo Ohgaki
f8a8ccaba2 Fixed Bug #65199 pg_copy_from() modifies input array variable 2015-02-03 15:26:02 +09:00
Xinchen Hui
0579e8278d bump year 2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Adam Harvey
3ef6e3726c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Check the return value of lo_export.
 2014-12-30 17:59:39 +00:00
Adam Harvey
211f4ceeae Check the return value of lo_export. 
Patch by Ondřej Surý. Fixes bug #68697 (lo_export return -1 on failure).
 2014-12-30 17:47:19 +00:00
Veres Lajos
4dc994571d typo fixes - https://github.com/vlajos/misspell_fixer 
Conflicts:
	ext/ftp/ftp.h
	ext/pcre/pcrelib/pcre_printint.c
	ext/pcre/pcrelib/sljit/sljitLir.c
	ext/pcre/pcrelib/sljit/sljitLir.h
	ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
	ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
	ext/pgsql/pgsql.c
	ext/phar/func_interceptors.c
	ext/soap/soap.c
	ext/standard/image.c
 2014-11-23 14:33:43 -08:00
Matteo Beccati
e797db8909 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests
  Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction
 2014-10-31 18:57:59 +01:00
Matteo Beccati
29ee694341 Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests 2014-10-31 18:54:16 +01:00
Adam Harvey
c580d9b69c Fix ext/pgsql builds against libpq 7.3. 
Fixes bug #67555 (Cannot build against libpq 7.3).
 2014-07-02 12:30:06 -07:00
Adam Harvey
d1adf55c15 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix ext/pgsql builds with libpq < 7.3.
 2014-07-01 13:25:55 -07:00
Adam Harvey
2e02f18b15 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix ext/pgsql builds with libpq < 7.3.
 2014-07-01 13:23:11 -07:00
Adam Harvey
899fe3d8af Fix ext/pgsql builds with libpq < 7.3. 
Fixes bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756).
 2014-07-01 13:19:22 -07:00
Bob Weinand
f614fc6898 Fix bug #66015 by reverting "Removed operations on constant arrays." 2014-04-11 10:08:44 +02:00
Nikita Popov
eaf44ec397 Remove some usages of hashtable internals 2014-04-09 12:31:21 +02:00
Daniel Lowrey
2ee4c987e6 Support async pgsql connections and non-blocking queries 
- New functions (each accepts a pgsql $connection resource):

  . pg_connect_poll
  . pg_socket
  . pg_consume_input
  . pg_flush

- Modified functions

  The following functions now additionally return zero if the
  underlying socket is set to non-blocking mode and the send
  operation does not complete immediately. Previously these
  functions returned only boolean TRUE/FALSE and blocked
  execution while polling until all data was sent:

  . pg_send_execute
  . pg_send_prepare
  . pg_send_query
  . pg_send_query_params

- New constants

  Used with pg_connect() to initiate an asynchronous connection
  attempt:

  . PGSQL_CONNECT_ASYNC

  Used with pg_connection_status() to determine the current state
  of an async connection attempt:

  . PGSQL_CONNECTION_STARTED
  . PGSQL_CONNECTION_MADE
  . PGSQL_CONNECTION_AWAITING_RESPONSE
  . PGSQL_CONNECTION_AUTH_OK
  . PGSQL_CONNECTION_SSL_STARTUP
  . PGSQL_CONNECTION_SETENV

  Used with pg_connect_poll() to determine the result of an
  async connection attempt:

  . PGSQL_POLLING_FAILED
  . PGSQL_POLLING_READING
  . PGSQL_POLLING_WRITING
  . PGSQL_POLLING_OK
  . PGSQL_POLLING_ACTIVE

- Polling via returned pg_socket() stream

  pg_socket() returns a read-only socket stream that may be
  cast to a file descriptor for select (and similar) polling
  operations. Blocking behavior of the pgsql connection socket
  can be controlled by calling stream_set_blocking() on the
  stream returned by pg_socket().
 2014-03-17 06:31:15 -06:00
Anatol Belski
6877af3f71 simplify the metadata part 2014-02-17 10:20:36 +01:00
Yasuo Ohgaki
d8aa130296 Imprement FR #25854 Return value for pg_insert should be resource instead of bool 2014-02-17 06:36:54 +09:00
Yasuo Ohgaki
5fd6365c77 Implement FR #41146 - Add "description" with exteneded flag pg_meta_data(). 
pg_meta_data(resource $conn, string $table [, bool extended])
It also made pg_meta_data() return "is enum" always.
 2014-02-17 06:24:10 +09:00
Anatol Belski
a9c0d319eb updated pgsql/config.w32 
keep track with the latest changes for postgles 9.3 compatibility
 2014-02-16 17:13:56 +01:00
Yasuo Ohgaki
170db1c577 Travis has old PostgreSQL server. Avoid test error. 2014-02-16 18:08:50 +09:00
Yasuo Ohgaki
4a2b39269f It seems travis needs ending >? 2014-02-16 16:40:58 +09:00
Yasuo Ohgaki
56854511d8 EXPERIMENTAL flags for pg_select/pg_insert/pg_update/pg_delete are removed. 
Use string escape for exotic types that allows to handle any data types. i.e. Array, JSON, JSONB, etc will work.
Add escape only query for better performance which removes meta data look up. Limitations forced by pg_convert() can be avoided with this. PGSQL_DML_ESCAPE constant is added for it.
 2014-02-16 14:11:21 +09:00
Yasuo Ohgaki
3f4134c00c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed possbile injections against pg_insert()/pg_delete()/pg_update()/pg_select()
 2014-02-16 10:47:32 +09:00
Yasuo Ohgaki
3fcdecf658 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed possbile injections against pg_insert()/pg_delete()/pg_update()/pg_select()
 2014-02-16 10:45:50 +09:00
Yasuo Ohgaki
f275fdcf00 Fixed possbile injections against pg_insert()/pg_delete()/pg_update()/pg_select() 2014-02-16 10:45:15 +09:00
Yasuo Ohgaki
a12c896dba Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Refactor build_tablename()
 2014-02-16 07:52:00 +09:00
Yasuo Ohgaki
f9537c2a0b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Refactor build_tablename()
 2014-02-16 07:51:50 +09:00
Yasuo Ohgaki
6f14b5ab41 Refactor build_tablename() 2014-02-16 07:51:27 +09:00
Yasuo Ohgaki
53f34bca76 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Revise encoding blacklist
 2014-02-16 06:25:15 +09:00
Yasuo Ohgaki
8c9fd8fb53 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Revise encoding blacklist
 2014-02-16 06:25:01 +09:00
Yasuo Ohgaki
9f251548ae Revise encoding blacklist 2014-02-16 06:21:39 +09:00
Felipe Pena
8cec20a565 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Fix ZTS build when HAVE_PQESCAPELITERAL is not set
  Update NEWS
  Update NEWS
 2014-02-15 11:05:25 -02:00
Felipe Pena
a65a546640 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fix ZTS build when HAVE_PQESCAPELITERAL is not set
  Update NEWS
 2014-02-15 11:05:08 -02:00
Felipe Pena
9d84f6c06e - Fix ZTS build when HAVE_PQESCAPELITERAL is not set 2014-02-15 11:04:49 -02:00
Yasuo Ohgaki
5ff9089aeb Merge branch 'PHP-5.5' into PHP-5.6 2014-02-15 18:30:11 +09:00
Yasuo Ohgaki
6e0b8b4288 Merge branch 'PHP-5.4' into PHP-5.5 2014-02-15 18:29:36 +09:00
Yasuo Ohgaki
832c21cabf Refactor and cleanup. WS is cleaned up. Use -b if it is needed. 
Added compatibility macros, PQescapeStringConn, PGSQLescapeLiteral/Identifier, PGSQLfree.
 2014-02-15 18:20:58 +09:00
Lior Kaplan
23d952ed60 Merge branch 'PHP-5.5' into PHP-5.6 2014-02-14 17:15:35 +02:00
Lior Kaplan
c09bd9def0 Merge branch 'PHP-5.4' into PHP-5.5 2014-02-14 15:30:00 +02:00
Veres Lajos
35101e9ef4 a few typofixes 2014-02-14 14:51:10 +02:00
Anatol Belski
4247f624cb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed missing usleep() prototype in pgsql
 2014-01-22 11:53:56 +01:00