5602f64213
Eliminate usages of _PP macros
...
These are either in debug code (fix them), commented out (drop
them) or in dead compatibility macros (drop them).
One usage was in php_stream_get_from_zval(), which we have not used
since at least PHP 5.2 and, judging from the fact that nobody
complained about it causing compile errors in PHP 7, nobody else
uses it either, so drop it.
There are still remaining uses in mysqli embedded and odbc birdstep.
These probably need to be dropped outright.
2016-03-03 23:20:12 +01:00
5983378364
Fix format attributes in ZTS
2016-02-14 14:44:27 +01:00
ed35de784f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Happy new year (Update copyright to 2016)
2016-01-01 19:48:25 +02:00
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
e6e77d9e27
Fix typo in php_stream_from_res_no_verify
...
This macro is not used but it's wrong as zend_fetch_resource
accepts only 3 args and just one res index. So obviously
we need to use zend_fetch_resource2 here.
2015-11-29 19:28:25 +00:00
d6130fada6
fixed wrong number for the new option
2015-07-02 14:22:59 +02:00
1a5a4d546e
add missing stuff is the header
2015-07-02 14:22:56 +02:00
6ad9cd5367
Only call stream_flush if anything was written
...
This avoids flushing in readonly mode upon close
2015-06-30 03:49:54 +02:00
4d9a1883aa
Fixed bug #68887 (resources are not freed correctly)
2015-04-08 13:29:42 +03:00
a141ccb4ff
Another minor cleanup, drop ENFORCE_SAFE_MODE (all except pdo_pgsql have #if's for checking already)
2015-03-29 09:34:05 +02:00
88cfc6ccb6
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix stream_select() issue with OpenSSL buffer
Conflicts:
main/streams/streams.c
2015-03-05 17:53:04 -07:00
e7df9d710c
Fix stream_select() issue with OpenSSL buffer
...
Ensure data from OpenSSL internal buffer has been
transfered to PHP stream buffer before a select()
emulation operation is performed
Addresses bug #65137
https://bugs.php.net/bug.php?id=65137
Conflicts:
ext/openssl/xp_ssl.c
2015-03-05 17:18:14 -07:00
2fa8d67a5c
Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse.
2015-03-04 02:05:28 +03:00
e98caf27ea
found type is unnecessary
2015-02-02 14:45:19 +08:00
7ec8eb380d
Use resource directly
2015-02-02 13:56:20 +08:00
38efb690c0
Ported ftp
2015-02-02 13:53:03 +08:00
942809909e
Cleanup resource handling APIs
2015-02-02 13:23:16 +08:00
fc33f52d8c
bump year
2015-01-15 23:27:30 +08:00
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
f62ad3bc57
Merge remote-tracking branch 'origin/master' into native-tls
...
* origin/master:
made the apache ini holders to be zend_bool
Removed useless local variable
Use simpler functions
Fixed test
small fixes to UPGRADING
Reorder to save alignment size (of course, only for common used structs)
2014-12-15 13:57:43 +01:00
7081c9bca6
Reorder to save alignment size (of course, only for common used structs)
2014-12-15 01:44:53 -05:00
e112f6a04e
second shot on removing TSRMLS_*
2014-12-14 14:07:59 +01:00
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
d2ab6e1d15
Merge branch 'PHP-5.6'
...
* PHP-5.6:
removing the NEWS entry as we had to revert this fix for now
Revert "Merge branch 'PHP-5.5' into PHP-5.6"
Revert "fix TS build"
Revert "Merge branch 'PHP-5.4' into PHP-5.5"
Revert "Bug #67965 : Fix blocking behavior in non-blocking crypto streams"
Revert "Bug #41631 : Fix regression from first attempt (6569db8
2014-10-15 19:41:27 +02:00
7b8222aa44
Revert "Merge branch 'PHP-5.4' into PHP-5.5"
...
This reverts commit 30a73658c67fac56e072
2014-10-15 19:33:31 +02:00
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
fdd1e96f3e
Revert "remove a few gcc format attributes from some printf-like functions"
...
This reverts commit 25f5ba94ac
2014-09-03 15:22:08 +02:00
25f5ba94ac
remove a few gcc format attributes from some printf-like functions
...
Since now PHP's printf-like functions have many custom specifiers, the amount of false-positives wasnt worth it
2014-08-31 11:45:11 -04:00
0a1df74895
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix stream_select() issue with OpenSSL buffer
2014-08-27 16:35:28 +01:00
db03216e62
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix stream_select() issue with OpenSSL buffer
2014-08-27 16:06:28 +01:00
30a73658c6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix stream_select() issue with OpenSSL buffer
Conflicts:
ext/openssl/xp_ssl.c
2014-08-27 16:01:18 +01:00
32be79dcfa
Fix stream_select() issue with OpenSSL buffer
...
Ensure data from OpenSSL internal buffer has been
transfered to PHP stream buffer before a select()
emulation operation is performed
Addresses bug #65137
https://bugs.php.net/bug.php?id=65137
Conflicts:
ext/openssl/xp_ssl.c
2014-08-27 13:25:50 +01:00
455741fce3
master renames phase 4
2014-08-25 20:57:25 +02:00
4d997f63d9
master renames phase 3
2014-08-25 20:22:49 +02:00
8ee2a4a9b5
first shot on merging the core fro the int64 branch
2014-08-16 11:16:11 +02:00
417ed16d11
Make stream->context indirect trough zend_resource (stream->ctx->ptr).
...
Fixed ext/standard/tests/streams/bug61115.phpt
2014-08-07 15:55:37 +04:00
449f3e6452
Fixed resource leak
2014-07-31 10:53:31 +04:00
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
774f16318b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #65701 : Do not use cache for file file copy
2014-04-20 15:27:39 -07:00
5addf223d5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #65701 : Do not use cache for file file copy
2014-04-20 15:25:03 -07:00
a18cec1b86
Fix bug #65701 : Do not use cache for file file copy
2014-04-20 15:22:44 -07:00
180de35bce
Refactor libxml (incompleted)
2014-04-11 18:07:25 +08:00
1c42751316
Refactor stream_get_record to return zend_string
2014-03-05 11:41:21 +08:00
0fe209e317
Refactor _php_stream_scandir to avoid memleak
2014-03-02 22:47:59 +08:00
5adeaa147d
Refactoring php_stream_copy_to_mem to return zend_string
2014-02-24 18:12:30 +08:00
40e053e7f3
Use better data structures (incomplete)
2014-02-13 17:54:23 +04:00
f4cfaf36e2
Use better data structures (incomplete)
2014-02-10 10:04:30 +04:00
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
Nikita Popov