Xinchen Hui
da3aeeed39
clean up - avoid realloc
2014-08-13 15:51:43 +08:00
Dmitry Stogov
4c716e8b51
Merge branch 'master' into test
...
* master: (39 commits)
Add __debugInfo() to UPGRADING.
fix TS build
Update NEWS
Update NEWS
Update NEWS
Small tidy ups and raise visibility of GitHub PR process
Bug #41631 : Observe socket read timeouts in SSL streams
wrap int8_t and int16_t with #ifdef to avoid possible clashes
- Updated to version 2014.6 (2014f)
Removed Countable::count() change info from UPGRADE.INTERNALS too
NEWS and UPGRADING for intdiv()
Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option"
Fixed skip case for intdiv 64-bit test
Use callback structure
Add EXPECTF
Fix handling of multi-result sets with PS...used to clean not only the result set but the whole PS.
5.5.17 now
5.4.33-dev now
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
...
Conflicts:
ext/fileinfo/libmagic/softmagic.c
main/streams/xp_socket.c
2014-08-11 11:38:41 +04:00
Andrey Hristov
fa19a22279
Merge branch 'PHP-5.6'
2014-08-06 16:52:44 +03:00
Andrey Hristov
9959ead309
Use callback structure
2014-08-06 16:50:27 +03:00
Andrey Hristov
3dc9bef819
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/fileinfo/data_file.c
ext/fileinfo/libmagic/softmagic.c
ext/fileinfo/magicdata.patch
2014-08-06 16:25:12 +03:00
Andrey Hristov
41e1ccefd5
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
configure.in
main/php_version.h
2014-08-06 15:27:56 +03:00
Andrey Hristov
547451796c
Fix handling of multi-result sets with PS...used to clean not only
...
the result set but the whole PS.
2014-08-06 14:52:12 +03:00
Dmitry Stogov
7301994c28
Merge branch 'master' into phpng
...
* master: (46 commits)
PHP_INT_MIN and _MAX tests
NEWS and UPGRADING
Added PHP_INT_MIN
Fix wrong lenght size
Bug #51096 - Remove unnecessary ? for first/last day of
Moved streams related functions to xp_ssl.c
Remove duplicate NEWS
Update NEWS
Update NEWS
Update NEWS
BFN
BFN
Fixed bug #67715 (php-milter does not build and crashes randomly).
We need to turn off any strict mode here for this warning to show up
Disable restrictions regarding arrays in constants at run-time. For the discussion around it, see the thread on the mailing list: http://www.mail-archive.com/internals@lists.php.net/msg68245.html
Revert "Fix bug #67064 in a BC safe way"
Updated NEWS for #67693
Updated NEWS for #67693
Fixed bug #67693 - incorrect push to the empty array
add missing entry to NEWS
...
Conflicts:
Zend/tests/errmsg_040.phpt
Zend/tests/ns_059.phpt
Zend/zend_language_parser.y
Zend/zend_vm_def.h
ext/openssl/openssl.c
ext/reflection/php_reflection.c
ext/session/session.c
ext/spl/spl_directory.c
ext/spl/spl_iterators.c
ext/sqlite3/sqlite3.c
ext/standard/array.c
2014-08-04 13:56:27 +04:00
Andrey Hristov
1d609d2d26
Merge branch 'PHP-5.6'
2014-07-31 21:28:19 +03:00
Andrey Hristov
f5deb18b20
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-31 21:28:09 +03:00
Andrey Hristov
95febf26c6
Fix wrong lenght size
2014-07-31 21:27:51 +03:00
Xinchen Hui
110bf9c720
Merge remote-tracking branch 'origin/master' into phpng
...
Conflicts:
Zend/zend_compile.h
ext/openssl/xp_ssl.c
2014-07-18 16:25:43 +08:00
Andrey Hristov
24381cdeb2
Merge branch 'PHP-5.6'
2014-07-16 19:50:41 +03:00
Andrey Hristov
23554aae19
Easier to read
2014-07-16 19:50:28 +03:00
Andrey Hristov
5d6805d498
Merge branch 'PHP-5.6'
...
Conflicts:
NEWS
2014-07-16 19:25:31 +03:00
Andrey Hristov
06f5f65c94
Add some trace info as well as update CLIENT_ flags
2014-07-16 19:24:39 +03:00
Xinchen Hui
d660d7f599
Fixed segfault while info printing
2014-06-30 15:26:55 +08:00
Xinchen Hui
b8e8b3fcf4
Save some strlen
2014-06-26 16:11:24 +08:00
Xinchen Hui
4cdea779f9
Use ZEND_HANDLE_NUMERIC
2014-06-25 16:34:53 +08:00
Xinchen Hui
c25828e41e
Fixed stack usage
2014-06-25 12:33:35 +08:00
Xinchen Hui
58fc40d525
Remove temp file committed by accident
2014-06-25 00:52:05 +08:00
Xinchen Hui
8ce23d8f4f
Don't use zend_string for other fields (only name here is enough)
2014-06-25 00:42:20 +08:00
Xinchen Hui
587923ccc8
Cleanup (refactoring is finish)
2014-06-23 23:33:38 +08:00
Xinchen Hui
305da4a88a
We don't need extra 1 byte anymore
2014-06-23 22:58:09 +08:00
Dmitry Stogov
ba45650d63
Fixed string destruction (ext/mysql/tests/mysql_list_fields.phpt was failed)
2014-06-23 17:18:47 +04:00
Xinchen Hui
56a966e88a
Respect the origin behavior (fix one test: ext/pdo_mysql/tests/bug_33689.phpt)
2014-06-23 19:34:55 +08:00
Xinchen Hui
92a7089893
Use zend_string in mysqlnd
2014-06-23 19:27:24 +08:00
Xinchen Hui
64c6b9bd58
typo
2014-06-23 17:10:25 +08:00
Xinchen Hui
c84aff541f
Fixed the trick....
2014-06-23 16:29:48 +08:00
Dmitry Stogov
36374ff32d
Merge branch 'master' into phpng
...
* master:
skip this test which fails without network
add missing entry to NEWS
add missing entry to NEWS
add NEWS block for 5.6.0RC2
Add support for gb18030/MySQL 5.7
Fix another problem with MySQL 5.7
new test, missing in ea466a3
Suppress test failure with MySQL 5.7
2014-06-20 11:16:57 +04:00
Dmitry Stogov
3f11ddcfe3
Fixed compilation warning
2014-06-20 10:32:05 +04:00
Dmitry Stogov
7e9176731f
Fixed compilation
2014-06-20 10:27:24 +04:00
Xinchen Hui
d632870e4d
Fixed memory leak
2014-06-20 13:27:56 +08:00
Xinchen Hui
e091a91f43
Fixed bugs in binding result
2014-06-20 13:08:40 +08:00
Xinchen Hui
d8a4b1affb
Fixed paramters binding
2014-06-19 22:28:43 +08:00
Xinchen Hui
82823e1e96
Fixed stat fields name
2014-06-19 16:16:41 +08:00
Xinchen Hui
e0680cb170
Fixed reference handling of bind_result
2014-06-19 16:08:45 +08:00
Xinchen Hui
f81498c8c8
Fixed invalid read
2014-06-19 15:56:35 +08:00
Xinchen Hui
ffaf8beda7
Fixed segfault
2014-06-19 14:43:14 +08:00
Xinchen Hui
049e52f19b
Fixed various bugs
2014-06-19 14:24:49 +08:00
Xinchen Hui
b7b5fa111b
Fixed MySQLi built with mysqlnd
2014-06-19 11:10:03 +08:00
Xinchen Hui
27e8e11ff9
unused variables
2014-06-19 10:46:23 +08:00
Andrey Hristov
2eb42c953d
Merge branch 'PHP-5.6'
...
Conflicts:
NEWS
2014-06-18 21:54:26 +03:00
Andrey Hristov
a886a0cf93
Add support for gb18030/MySQL 5.7
2014-06-18 21:53:34 +03:00
Xinchen Hui
b38f6f3de9
Fixed various bugs (ext/mysql with mysqlnd tests pass)
2014-06-18 23:37:15 +08:00
Xinchen Hui
d5c6816e86
Fixed memory leak while doing fetch
2014-06-18 16:10:51 +08:00
Xinchen Hui
98afbc7f75
Fixed segfaults
2014-06-18 15:43:15 +08:00
Xinchen Hui
ac1d6abbef
copy_data seems useless now
2014-06-18 15:13:43 +08:00
Xinchen Hui
83d450c78d
Fixed segfault of stream handling
2014-06-18 15:03:01 +08:00
Xinchen Hui
4c4dc8e239
Fixed plugin fetching
2014-06-18 14:26:17 +08:00
Xinchen Hui
6288bb8ffe
Refactoring mysqlnd (incompleted, only mysqlnd ext compilable)
2014-06-18 12:09:37 +08:00
Andrey Hristov
5d4f9dfff4
Second set of changes to mysqlnd for phpng.
...
A bit problematic is that the streams seem not to be completely ported.
Also there are some hacks in the streams about EG(regular_list) and EG(persistent_list)
and these need to be carefully checked. The test suite should catch them, however.
2014-05-20 21:50:15 +03:00
Andrey Hristov
5d57e17a15
First set of phpng changes for mysqlnd
2014-05-20 19:57:11 +03:00
Andrey Hristov
2312af04a7
Defensive check
2014-05-20 16:41:14 +03:00
Andrey Hristov
e6e5d3535d
remove mysqlnd_bt.c as it a long dead code
2014-05-19 20:32:41 +03:00
Pierre Joye
fca1e0c574
more port to phpng, zend_string and hash, work in progress
2014-05-18 11:19:02 +02:00
Pierre Joye
6223702cf4
fix smart string usage (work in progress), ps: a lot of len tests are done twice or more, rooms for cleanup here
2014-05-17 15:34:03 +02:00
Pierre Joye
bd1aae54eb
fix init, new smart_str struct (use zend_string now)
2014-05-17 15:29:25 +02: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
Anatol Belski
a35723f6e1
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix crash in MINFO when no mysqlnd plugins are loaded
2014-04-14 17:45:18 +02:00
Anatol Belski
9e76e87ca9
fix crash in MINFO when no mysqlnd plugins are loaded
2014-04-14 17:44:47 +02:00
Anatol Belski
f0c95cb705
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix syntax error in vc++
2014-04-11 13:28:13 +02:00
Anatol Belski
5c87ed058b
fix syntax error in vc++
2014-04-11 13:08:46 +02:00
Andrey Hristov
6828437c11
Merge branch 'PHP-5.6'
...
Conflicts:
NEWS
ext/mysqlnd/mysqlnd_result.c
2014-04-10 18:22:01 +03:00
Andrey Hristov
090c3e87c0
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
Conflicts:
ext/mysqli/tests/mysqli_begin_transaction.phpt
2014-04-10 16:49:13 +03:00
Andrey Hristov
63791d055a
New result fetching mode for mysqlnd, which should use less memory but
...
implies more memory copy. The old method is still available and can be used.
It stays as default. Choosing the method is through a flag to mysqli_query()/mysqli_real_query()
New mode can be forced with an INI setting, for all extensions that support this mode
(ext/mysql and mysqli, because PDO due to it's architecture can't support it)
The setting is mysqlnd.fetch_data_copy=[0|1]
2014-04-10 16:44:54 +03:00
Nikita Popov
21e01f2b70
Merge branch 'PHP-5.6'
2014-04-09 12:31:35 +02:00
Nikita Popov
eaf44ec397
Remove some usages of hashtable internals
2014-04-09 12:31:21 +02:00
Andrey Hristov
ea93d1fe83
Merge branch 'PHP-5.6'
2014-03-20 17:24:26 +02:00
Andrey Hristov
d2ab74588e
Merge branch 'PHP-5.5' into PHP-5.6
2014-03-20 16:30:01 +02:00
Andrey Hristov
41b4b84dda
Emit a warning in case of unallowed characters. Fix another place this
...
code is used - reuse
2014-03-20 16:23:40 +02:00
Andrey Hristov
8ed85557e0
Merge branch 'PHP-5.6'
2014-03-20 16:16:27 +02:00
Andrey Hristov
e52334fdbe
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/mysqli/mysqli_api.c
2014-03-20 16:16:12 +02:00
Andrey Hristov
059bc99d94
don't replace with ?, just skip it
2014-03-20 12:11:16 +02:00
Andrey Hristov
e756f417b9
Merge branch 'PHP-5.6'
2014-03-19 18:55:40 +02:00
Andrey Hristov
01c2ec03bc
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
NEWS
configure.in
ext/mysqli/mysqli_api.c
main/php_version.h
2014-03-19 18:54:39 +02:00
Andrey Hristov
d63ed101ee
Fix problem with mysqli_commt()/mysqli_rollback()
2014-03-19 18:32:19 +02:00
Andrey Hristov
5e836b443c
Merge branch 'PHP-5.6'
2014-03-10 19:16:22 +02:00
Andrey Hristov
d2a291393a
inject it directly. This is not C++ and I don't want to use hacks with similar structures
...
that are binary compatible. Better be explicit.
2014-03-10 19:15:30 +02:00
Andrey Hristov
3456d47235
Merge branch 'PHP-5.6'
2014-03-10 18:19:22 +02:00
Andrey Hristov
73f03a47d0
DI
2014-03-10 18:18:56 +02:00
Andrey Hristov
f995187d34
Merge branch 'PHP-5.6'
2014-03-10 17:26:13 +02:00
Andrey Hristov
990f9c8f3f
Switch from a single flag to a flag byte
2014-03-10 17:25:53 +02:00
Andrey Hristov
9a112e00cd
Merge branch 'PHP-5.6'
2014-03-10 12:55:53 +02:00
Andrey Hristov
c8033ac207
Merge branch 'PHP-5.5' into PHP-5.6
2014-03-10 12:53:17 +02:00
Andrey Hristov
3a76cb2d95
Fix indentation
2014-03-10 12:52:56 +02:00
Andrey Hristov
529fdd5bb0
Merge branch 'PHP-5.6'
2014-03-05 16:24:43 +02:00
Andrey Hristov
6b804b96b8
Refactor the result set data structures. Move more to the buffered and unbuffered
...
substructures. Add methods to these too. Preparing for pluggable interface for
returning data to the engine (zvals, c-style, something else)
2014-03-05 16:22:23 +02:00
Andrey Hristov
f3e59b838e
Merge branch 'PHP-5.6'
2014-02-17 19:04:14 +02:00
Andrey Hristov
3e59f041da
remove dead code
2014-02-17 19:04:01 +02:00
Andrey Hristov
f83e88e3ea
Merge branch 'PHP-5.6'
2014-02-17 18:37:59 +02:00
Andrey Hristov
b2cd56c3cb
Move code out, that handles the actual structure to be used for the decoded
...
data. Will make it easier to add different structures
2014-02-17 18:37:08 +02:00
Dmitry Stogov
f4cfaf36e2
Use better data structures (incomplete)
2014-02-10 10:04:30 +04:00
Andrey Hristov
d9078c7c8d
Merge branch 'PHP-5.6'
2014-01-28 15:47:50 +02:00
Andrey Hristov
c1141d43e9
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-28 15:38:14 +02:00
Andrey Hristov
6b77c3aaa1
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-28 15:33:16 +02:00
Andrey Hristov
79cbcd9ded
add text for the new constants
2014-01-28 15:32:59 +02:00
Andrey Hristov
a87125c1e8
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-28 15:24:45 +02:00
Andrey Hristov
d3faae03ec
add new consts
2014-01-28 15:23:41 +02:00
Andrey Hristov
3aa6f8bfdd
Merge branch 'PHP-5.6'
2014-01-24 12:31:33 +02:00
Andrey Hristov
350b5dddac
WS
2014-01-24 12:31:19 +02:00
Andrey Hristov
dc6b14149d
Merge branch 'PHP-5.6'
...
Conflicts:
ext/mysqlnd/mysqlnd_ps_codec.c
2014-01-24 12:15:03 +02:00
Andrey Hristov
cd2cc7b8f9
Reduce code duplication a bit
2014-01-24 11:52:35 +02:00
Andrey Hristov
0c90c207a7
Backport refactoring from php-src
2014-01-24 11:39:24 +02:00
Andrey Hristov
7072db5a6b
FIx failing tests because of operator precedence
2014-01-23 18:20:13 +02:00
Johannes Schlüter
676864684b
Merge branch 'PHP-5.6'
2014-01-21 16:40:13 +01:00
Johannes Schlüter
4d43e2efdb
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-21 16:38:32 +01:00
Johannes Schlüter
09eb3cf381
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-21 16:37:02 +01:00
Johannes Schlüter
2311ba7d3f
Fix bug #66283 (Segmentation fault after memory_limit)
...
There are situations where mysqlnd dupliates zvals while freeing result
sets. If the memory_limit is reached during this operation the engine
will bailout. This patch makes sure that a later attempt (during
RSHIUTDOWN) won't cause a double free, instead we rely on the engine to
free emalloc()ed memory after bailout.
2014-01-21 16:28:30 +01:00
Anatol Belski
25e57e702b
fix uninitialized value
2014-01-14 09:47:27 +01:00
Andrey Hristov
73008bb5ce
More refactoring of the big function generating execute requests
2014-01-14 01:31:16 +02:00
Andrey Hristov
cf9966671c
Merge branch 'master' of git.php.net:php-src
2014-01-13 12:40:59 +02:00
Andrey Hristov
01d5e28057
move common code into a function
2014-01-13 12:40:39 +02:00
Johannes Schlüter
82dfe1acc8
Merge branch 'PHP-5.6'
2014-01-10 16:04:29 +01:00
Johannes Schlüter
45d46d7edd
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-10 16:02:46 +01:00
Johannes Schlüter
98e06a10d3
fix encoding
2014-01-10 15:57:40 +01:00
Xinchen Hui
0f53e37494
Merge branch 'PHP-5.6'
2014-01-03 11:09:07 +08: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
Kalle Sommer Nielsen
c83598119b
Kill a TSRMLS_FETCH() in php_stream_context_set() by passing TSRMLS_CC to it
...
# For mysqlnd: Relevant PHP_API_VERSION are put in place for cross version compatibility
2013-12-18 09:19:24 +01:00
Andrey Hristov
97909ef4ef
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-04 12:39:11 +02:00
Andrey Hristov
ceb1b7e20f
Merge branch 'PHP-5.4' into PHP-5.5
2013-12-04 12:07:18 +02:00
Andrey Hristov
86aad97979
Fix loss of precision
2013-12-04 12:06:59 +02:00
Stanislav Malyshev
22ad8e1b1a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.4.24-dev now
merge fix
add test
Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)
2013-11-27 00:18:54 -08:00
Andrey Hristov
5a3886f15c
merge fix
2013-11-26 19:15:30 +02:00
Andrey Hristov
40dc242904
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
ext/mysqlnd/mysqlnd.c
2013-11-26 19:02:45 +02:00
Andrey Hristov
74ba88e186
Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)
2013-11-26 19:01:49 +02:00
Anatol Belski
696d286911
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed test
And here is the real fix for #66124
Fix for Bug #66124 (mysqli under mysqlnd loses precision when bind_param with 'i')
2013-11-21 21:29:35 +01:00
Andrey Hristov
763f4aef8b
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-21 21:29:37 +02:00
Andrey Hristov
ce09822269
And here is the real fix for #66124
2013-11-21 21:29:21 +02:00
Xinchen Hui
2a94494b7e
Merge branch 'PHP-5.5'
2013-11-05 11:09:08 +08:00
Xinchen Hui
d4f5ca467f
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
configure.in
ext/mysqlnd/mysqlnd.c
main/php_version.h
2013-11-05 11:08:09 +08:00
Lior Kaplan
d3fd163d27
Typo fix: umknown -> unknown
2013-10-31 23:12:41 +02:00
Martin Hujer
55ee543e2f
Typo fix: umknown -> unknown
2013-10-31 22:59:42 +02:00
Michael Wallner
611122c22e
Merge branch '2Guploads'
...
* 2Guploads:
add NEWS entry; add simple test
more precise condition
make this work in vc11 too
Use int64_t and atoll() after discussion with johannes
ws
Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
unify stdint type usage
2013-08-09 11:47:25 +02:00
Andrey Hristov
42dbc598dd
Merge branch 'PHP-5.5'
2013-08-08 13:53:08 +02:00
Andrey Hristov
82a7ec72de
add some tracing
2013-08-08 13:51:55 +02:00
Michael Wallner
14caf174ff
unify stdint type usage
...
if you need C99 stdint types, just include "php_stdint.h"
2013-08-06 22:49:56 +02:00
Christopher Jones
4c3c9d1fe5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix long-standing visual pain point: the misalignment of './configure help' text. Whitespace changes and a couple of grammar fixes.
2013-08-06 11:09:12 -07:00
Christopher Jones
c6d977dd39
Fix long-standing visual pain point: the misalignment of './configure help' text.
...
Whitespace changes and a couple of grammar fixes.
2013-08-06 11:06:09 -07:00
Kalle Sommer Nielsen
cabf38af6d
Merge branch 'PHP-5.4'
2013-08-05 17:23:00 +02:00
Kalle Sommer Nielsen
963c1be38d
Merge branch 'PHP-5.5'
2013-08-05 17:16:05 +02:00
Kalle Sommer Nielsen
85b7e9f046
Check for NULL ptr from get_stream() before passing it on to php_stream_cast()
2013-08-05 16:58:37 +02:00
Stanislav Malyshev
68e8326e0e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
non living code related typo fixes
2013-08-04 16:07:13 -07:00
Stanislav Malyshev
c793a65690
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
non living code related typo fixes
Conflicts:
Zend/zend_compile.c
2013-08-04 16:06:24 -07:00
Veres Lajos
8d86597d73
non living code related typo fixes
2013-08-04 16:05:36 -07:00
Andrey Hristov
a047ece2e0
Disable a flag
2013-07-22 11:02:48 +02:00
Andrey Hristov
2c3f6dcdb6
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
...
Conflicts:
NEWS
2013-07-08 20:28:51 +02:00