Florian MARGAINE
cf0303e782
Replaces php5 with php7, without whitespace changes.
2014-09-20 10:01:44 +02:00
Johannes Schlüter
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
Dmitry Stogov
3bc8a958c5
Fixed useless or duplicated IS_INTERNED() checks
2014-09-19 15:41:01 +04:00
Anatol Belski
32c46f44a8
avoid strlen usage in the loop
2014-09-15 00:39:55 +02:00
Tjerk Meesters
18fa07e68f
Revert "Revert "Removing ext/ereg and dependencies""
...
This reverts commit 1981dd9c73
.
2014-09-11 19:25:42 +08:00
Dmitry Stogov
1981dd9c73
Revert "Removing ext/ereg and dependencies"
...
This reverts commit 86de7963fe
.
2014-09-11 11:06:57 +04:00
Tjerk Meesters
86de7963fe
Removing ext/ereg and dependencies
...
Affected extensions:
- opcache (use pcre)
- mbstring (removed ereg functions overloading)
- pgsql (use pcre)
- reflection (test cases using 'ereg')
SAPI:
- apache (header only)
- apache_hooks (header only)
2014-09-11 10:22:44 +08:00
Anatol Belski
a502639412
remove the expression parts, which are always true
2014-08-28 11:38:23 +02:00
Anatol Belski
e831de3024
fix some types and unnecessary casts
2014-08-28 11:38:22 +02:00
Anatol Belski
d2e416a90b
fix pg_last_notice()
2014-08-28 10:45:47 +02:00
Anatol Belski
ca0069bc33
fix remaining 's' args for pgsql
2014-08-28 00:21:12 +02:00
Anatol Belski
257ed4061a
's' works with size_t round 2
2014-08-27 20:49:33 +02:00
Anatol Belski
3234480827
first show to make 's' work with size_t
2014-08-27 20:49:31 +02:00
Anatol Belski
202e8db1dc
fixed several long vs zend_long casts
2014-08-26 11:26:53 +02:00
Anatol Belski
af59e92b24
master renames phase 7
2014-08-25 21:51:49 +02:00
Anatol Belski
4d997f63d9
master renames phase 3
2014-08-25 20:22:49 +02:00
Anatol Belski
c3e3c98ec6
master renames phase 1
2014-08-25 19:24:55 +02:00
Anatol Belski
70de6180d5
fixes to %pd format usage
2014-08-24 02:35:34 +02:00
Anatol Belski
c1b65ac66b
fix zpp
2014-08-21 15:54:47 +02:00
Anatol Belski
bdbf47df18
ported mysql and mysqlnd
2014-08-19 16:51:06 +02:00
Anatol Belski
1d8bc9a274
ported ext/pgsql
2014-08-19 16:11:28 +02:00
Anatol Belski
97c5172ac7
Merge remote-tracking branch 'php/master'
...
Conflicts:
ext/date/lib/parse_date.c
2014-08-19 08:27:43 +02:00
Anatol Belski
63d3f0b844
basic macro replacements, all at once
2014-08-19 08:07:31 +02:00
Anatol Belski
e83f3e7f03
added missing define
2014-08-19 08:00:52 +02:00
Dmitry Stogov
bce6a36c8a
Merge branch 'master' into test
...
* master: (48 commits)
change locale - looks like not everybody has sl_SI
Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone
fix format
Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
Make sure the generator script also creates a newline at the end of file
Add newline at end of file to prevent compilation warning
Fix handling of session user module custom handlers.
Reference bug report instead of github issue in NEWS file
add more exts for Travis
Update NEWS
Fix phpdbg.1 man page installation when build != src directory
BFN for bug #67551 (php://input temp file will be located in sys_temp_dir instead of upload_tmp_dir)
reorder
restore API compatibility
finish
refactor php_stream_temp_create{,_ex} and use it for the php://input stream
refactor _php_stream_fopen_{temporary_,tmp}file()
fix length overflow of HTTP_RAW_POST_DATA
Update NEWS
Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault happen)
...
Conflicts:
ext/opcache/zend_accelerator_util_funcs.c
ext/session/mod_user.c
ext/spl/spl_array.c
ext/spl/spl_dllist.c
ext/standard/file.c
ext/standard/streamsfuncs.c
ext/standard/string.c
main/streams/memory.c
2014-07-07 19:21:23 +04: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
Dmitry Stogov
6e7338700e
Avoid useless merge
2014-06-04 02:11:26 +04:00
Dmitry Stogov
20f6dec6b6
Use new zend_hash API
2014-05-28 16:56:41 +04:00
Dmitry Stogov
35f23d9ee7
Fixed incorrect Z_LVAL() usage
2014-05-19 12:51:48 +04:00
Xinchen Hui
a816032285
Fixed memleak (3 tests fails now)
2014-05-19 14:57:17 +08:00
Xinchen Hui
98f801ccbc
Fixed resources apply_dtor
2014-05-19 14:53:02 +08:00
Xinchen Hui
09d2f4b195
It's a zend_array not Hashtable (fixed segfault)
2014-05-19 14:49:28 +08:00
Xinchen Hui
ed554704f3
Fixed segfault
2014-05-19 14:44:59 +08:00
Xinchen Hui
1ff7c7b9a3
Refactoring ext/pgsql (incompleted, only compilable)
2014-05-19 14:25:30 +08:00
Dmitry Stogov
f9927a6c97
Merge mainstream 'master' branch into refactoring
...
During merge I had to revert:
Nikita's patch for php_splice() (it probably needs to be applyed again)
Bob Weinand's patches related to constant expression handling (we need to review them carefully)
I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)
Conflicts:
Zend/zend.h
Zend/zend_API.c
Zend/zend_ast.c
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_constants.c
Zend/zend_exceptions.c
Zend/zend_execute.c
Zend/zend_execute.h
Zend/zend_execute_API.c
Zend/zend_hash.c
Zend/zend_highlight.c
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_variables.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/date/php_date.c
ext/dom/documenttype.c
ext/hash/hash.c
ext/iconv/iconv.c
ext/mbstring/tests/zend_multibyte-10.phpt
ext/mbstring/tests/zend_multibyte-11.phpt
ext/mbstring/tests/zend_multibyte-12.phpt
ext/mysql/php_mysql.c
ext/mysqli/mysqli.c
ext/mysqlnd/mysqlnd_reverse_api.c
ext/mysqlnd/php_mysqlnd.c
ext/opcache/ZendAccelerator.c
ext/opcache/zend_accelerator_util_funcs.c
ext/opcache/zend_persist.c
ext/opcache/zend_persist_calc.c
ext/pcre/php_pcre.c
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
ext/pdo_pgsql/pgsql_driver.c
ext/pgsql/pgsql.c
ext/reflection/php_reflection.c
ext/session/session.c
ext/spl/spl_array.c
ext/spl/spl_observer.c
ext/standard/array.c
ext/standard/basic_functions.c
ext/standard/html.c
ext/standard/mail.c
ext/standard/php_array.h
ext/standard/proc_open.c
ext/standard/streamsfuncs.c
ext/standard/user_filters.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_variables.c
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_bp.c
sapi/phpdbg/phpdbg_frame.c
sapi/phpdbg/phpdbg_help.c
sapi/phpdbg/phpdbg_list.c
sapi/phpdbg/phpdbg_print.c
sapi/phpdbg/phpdbg_prompt.c
2014-04-26 00:32:51 +04:00
Dmitry Stogov
050d7e38ad
Cleanup (1-st round)
2014-04-15 15:40:40 +04: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
Anatol Belski
e67ef24227
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed missing usleep() prototype in pgsql
2014-01-22 11:53:32 +01:00
Anatol Belski
7bcf01f39a
fixed missing usleep() prototype in pgsql
2014-01-22 11:52:52 +01:00
Yasuo Ohgaki
28be6aea9c
Added pg_lo_truncate() and 64bit large object support from PostgreSQL 9.3 and up
2014-01-15 14:37:24 +09:00
Yasuo Ohgaki
c58329fccc
Always initialize pg_version() result array elements to prevent failed test with older postgresql servers. Add missing client_encoding element.
2014-01-15 14:27:33 +09:00
Yasuo Ohgaki
d0924c2500
Fixed pg_version() crash with older postgresql
2014-01-15 13:32:15 +09:00
Yasuo Ohgaki
58dff7cee5
Made pg_version() return full connection info.
2014-01-14 10:10:48 +09:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
Yasuo Ohgaki
29e5a9659f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix Coverity issue reporting wrong sizeof()
2013-10-22 12:30:24 +09:00
Yasuo Ohgaki
6af3683a4c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix Coverity issue reporting wrong sizeof()
2013-10-22 12:29:01 +09:00
Yasuo Ohgaki
1f5b1cfb2b
Fix Coverity issue reporting wrong sizeof()
2013-10-22 12:27:18 +09:00
Matteo Beccati
80917e5ca2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed other compiler warnings
2013-08-22 15:34:22 +02:00
Matteo Beccati
908da14bd1
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed other compiler warnings
2013-08-22 15:34:11 +02:00
Matteo Beccati
d5987478a8
Fixed other compiler warnings
2013-08-22 15:33:54 +02:00
Nikita Popov
c0d99fd76a
Apply pgsql notice test fixes to PHP-5.5
2013-08-22 14:02:55 +02:00
Nikita Popov
1a88fcc2d8
Remove trailing whitespace in test
...
Third try to make this work...
2013-08-22 13:09:53 +02:00
Nikita Popov
96045e1b33
Forgot newline in test
2013-08-22 12:26:34 +02:00
Nikita Popov
b668a26c2f
Fix pgsql notice test failure
2013-08-22 11:31:56 +02:00
Matteo Beccati
3ec28b1d1f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed compiler warnings in ext/pgsql
Fixed other compiler warnings in PDO_PGSQL
Fixed compiler warning
Update NEWS
Conflicts:
ext/pdo_pgsql/pgsql_driver.c
2013-08-21 11:26:41 +02:00
Matteo Beccati
4283f75c34
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed compiler warnings in ext/pgsql
Fixed other compiler warnings in PDO_PGSQL
Fixed compiler warning
2013-08-21 11:24:27 +02:00
Matteo Beccati
540f325664
Fixed compiler warnings in ext/pgsql
2013-08-21 11:24:12 +02:00
Yasuo Ohgaki
fdef0e38f7
Revert wrong description
2013-08-20 17:38:17 +09:00
Yasuo Ohgaki
7d538cf8dd
Fixed test bug
2013-08-20 14:25:12 +09:00
Yasuo Ohgaki
e960eebfea
Revise pgsql tests
2013-08-18 18:24:34 +09:00
Anatol Belski
c5674bb502
Merge branch 'PHP-5.5'
...
* PHP-5.5:
removed unused vars
2013-08-12 15:53:34 +02:00
Anatol Belski
bab33f7e05
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
removed unused vars
2013-08-12 15:52:50 +02:00
Anatol Belski
72aacbf735
removed unused vars
2013-08-12 15:52:15 +02:00
Anatol Belski
42171b13f4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fixed strndup usage in the pgsql ext
2013-08-12 15:45:43 +02:00
Anatol Belski
87198989cd
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed strndup usage in the pgsql ext
2013-08-12 15:45:26 +02:00
Anatol Belski
4134ebec8e
fixed strndup usage in the pgsql ext
2013-08-12 15:44:47 +02:00
Yasuo Ohgaki
3ada3aaea6
Revise pgsql test files
2013-08-12 05:14:43 +09:00