bdnugget/php-src
1
0 Fork 0
mirror of https://github.com/bdnugget/php-src.git synced 2026-11-11 11:10:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,526 Commits 375 Branches 1,117 Tags
1c462a4e4d4ce375492995b014dcafe44825f6d3
Commit Graph
3999 Commits
Author SHA1 Message Date
Anatol Belski f2fc935502 next wave on semantical replacements long vs. int 2013-12-19 23:32:58 -08:00
Anatol Belski 6125278290 more semantical replacements LONG vs. INT 2013-12-19 08:40:41 -08:00
Anatol Belski f58d0b35ed massive update semantical LONG vs INT replacements 2013-12-19 05:07:37 -08:00
Anatol Belski b1abe4ca21 mass replacement for zend_size_t/php_size_t 2013-12-18 14:46:44 -08:00
Anatol Belski 6d938321ff prepare for zend_size_t 2013-12-18 14:22:47 -08:00
Anatol Belski df7db6519c Merge remote-tracking branch 'origin/master' into str_size_and_int64 2013-12-18 17:07:00 +01:00
Bob Weinand b11b3d201f Fixed ZTS build. Needed to bump API version number. 2013-12-18 16:44:20 +01:00
Anatol Belski 8432557dcd Merge remote-tracking branch 'origin/master' into str_size_and_int64 
Conflicts:
	Zend/zend.c
	Zend/zend.h
	Zend/zend_execute.h
	Zend/zend_vm_execute.h
	main/SAPI.h
 2013-12-18 15:07:42 +01:00
Kalle Sommer Nielsen aed4b086ac Eliminate the TSRMLS_FETCH() calls in the ticks functions and hook 2013-12-18 09:32:26 +01: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
Kalle Sommer Nielsen ed5a8d510f Pass the TSRMLS parameters to the sapi flush hook, this shaves off a few TSRMLS_FETCH() calls in our various SAPIs 2013-12-18 09:06:39 +01:00
Kalle Sommer Nielsen bd58146ad6 Kill another TSRMLS_FETCH() in the zend extension loading code 2013-12-18 07:59:47 +01:00
Kalle Sommer Nielsen d14670ccdb Eliminate another TSRMLS_FETCH() in i_zend_is_true() 
# Affected extensions have all been updated, ext/opcache and ext/zip
# both have macros for cross version compatibility
 2013-12-18 07:25:05 +01:00
Anatol Belski 936124742b fixed function signature 2013-12-13 11:09:30 +01:00
Anatol Belski f806f4d060 Merge branch 'master' into str_size_and_int64 2013-12-13 10:45:27 +01:00
Kalle Sommer Nielsen 1433dec2d0 Kill another TSRMLS_FETCH() in zend_indent() 2013-12-12 22:09:38 +01:00
Anatol Belski e0c7899ddd Merge branch 'master' into str_size_and_int64 2013-12-12 10:52:52 +01:00
Anatol Belski 58b754ca4a Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #65486 mysqli_poll() is broken on Win x64
 2013-12-12 10:46:36 +01:00
Anatol Belski 39a2dcdeac Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #65486 mysqli_poll() is broken on Win x64
 2013-12-12 10:46:21 +01:00
Anatol Belski da62fd5ed8 Fixed bug #65486 mysqli_poll() is broken on Win x64 
While this issue is visible in mysqli_poll() functions, the cause
lays deeper in the stream to socket casting API. On Win x64 the
SOCKET datatype is a 64 or 32 bit unsigned, while on Linux/Unix-like
it's 32 bit signed integer. The game of casting 32 bit var to/from
64 bit pointer back and forth is the best way to break it.

Further more, while socket and file descriptors are always integers
on Linux, those are different things using different APIs on Windows.
Even though using integer instead of SOCKET might work on Windows, this
issue might need to be revamped more carefully later. By this time
this patch is tested well with phpt and apps and shows no regressions,
neither in mysqli_poll() nor in any other parts.
 2013-12-12 10:17:01 +01:00
Anatol Belski 325224832b Merge remote-tracking branch 'origin/master' into str_size_and_int64 
Conflicts:
	Zend/zend_compile.c
	Zend/zend_compile.h
 2013-12-09 10:20:04 +01:00
Michael Wallner 01a13bb8c1 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #61645 (fopen and O_NONBLOCK)
  fix possibly uninitialized value
  Use 'user@example.com' rather than 'user@company.com' in tests
 2013-12-06 10:34:11 +01:00
Michael Wallner 9ea2489f5c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #61645 (fopen and O_NONBLOCK)
  fix possibly uninitialized value
 2013-12-06 10:33:47 +01:00
Michael Wallner a48d82d238 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #61645 (fopen and O_NONBLOCK)
  fix possibly uninitialized value
 2013-12-06 10:33:10 +01:00
Michael Wallner b5f5bff965 Fixed bug #61645 (fopen and O_NONBLOCK) 
if a mode like "rn" was passed to fopen(), then
php_stream_parse_fopen_modes() would assign O_WRONLY to
flags, because O_NONBLOCK tainted flags for the r/w/+ check
 2013-12-06 10:29:24 +01:00
Anatol Belski a0622d7c68 implemented %pd format for snprintf and spprintf 
php_int_t var = 42;
php_printf("%pd", var);
 2013-12-05 12:05:46 +01:00
Anatol Belski 42b1222754 Merge branch 'master' into str_size_and_int64 2013-12-05 08:37:37 +01:00
Adam Harvey de3b9bc77c Renumber the comments in php_request_shutdown() to be in order. 
What, me OCD?
 2013-12-04 14:29:45 -08:00
Andrey Hristov 406d5a5ecc Merge branch 'PHP-5.6' 
Conflicts:
	NEWS
	UPGRADING
 2013-12-04 16:20:03 +02:00
Anatol Belski 55023a87b0 Merge branch 'master' into str_size_and_int64 2013-12-04 09:10:43 +01:00
Sara Golemon e51ddf9dc8 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix php_module_startup() when loading more than one additional module
 2013-12-03 18:21:40 -08:00
Sara Golemon df755deb45 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix php_module_startup() when loading more than one additional module
 2013-12-03 18:21:12 -08:00
Sara Golemon 00a7b1ff7f Fix php_module_startup() when loading more than one additional module 
Dereferencing addition_modules within php_module_startup would
point to a vector entirely on the stack (which is of course, wrong).

Use a specialized helper to keep BC with the current php_module_startup()
calling semantics.

Fixes 63159
Thanks to @a-j-k
 2013-12-03 18:20:19 -08:00
Julien Pauli e9c6a1cfd2 5.5.8-dev now 2013-11-27 09:34:40 +01:00
Stanislav Malyshev 63f3ff7b5f 5.4.24-dev now 2013-11-27 00:13:45 -08:00
Anatol Belski 0938a6266a fixes so file_get_contents() works again, and some more 2013-11-25 16:21:14 +01:00
Anatol Belski c6adc039a1 more datatype fixes 2013-11-25 00:44:33 +01:00
Anatol Belski 3198533e92 ZEND_INT_FMT again 2013-11-24 22:28:58 +01:00
Anatol Belski 9cc9a10efd one more walk through in Zend, fixed (or broken) things being overseen 2013-11-24 18:55:26 +01:00
Anatol Belski 51003463ef first shot for php-cgi for size_t and php_int_t 2013-11-21 13:26:56 +01:00
Anatol Belski 7156c5cb39 datatype fixes for iconv 2013-11-20 17:11:10 +01:00
Anatol Belski 383ddcde2b Merge branch 'master' into str_size_and_int64 2013-11-18 09:10:22 +01:00
Kalle Sommer Nielsen 9e3551ba1f Eliminated the TSRMLS_FETCH() in zend_set_memory_limit() 2013-11-18 01:36:17 +01:00
Anatol Belski 15bb12b269 fixed "struct stat" usage in main, cli and ext/standard 2013-11-13 12:39:12 +01:00
Anatol Belski 468b2923ca fixed stat usage, yet core only 
- defined php_stat_t as replacement for struct stat
- on _WIN64 use _fstat64
 2013-11-12 21:10:23 +01:00
Julien Pauli 1984919ddc 5.5.7 now 2013-11-12 18:20:09 +01:00
Anatol Belski 266a428a59 use appropriate seek() and tell() on _WIN64 2013-11-12 00:41:58 +01:00
Anatol Belski f90fe17424 define platform dependent zend_off_t 2013-11-12 00:24:52 +01:00
Anatol Belski ad675f6ac2 Merge branch 'master' into str_size_and_int64 
Conflicts:
	main/php_version.h
 2013-11-09 11:03:04 +01:00
Anatol Belski 27a86a4402 fixed 64 bit pass by ref 2013-11-09 02:09:14 +01:00