bdnugget/php-src
1
0 Fork 0
mirror of https://github.com/bdnugget/php-src.git synced 2026-11-08 01:37:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,898 Commits 375 Branches 1,117 Tags
str_size_and_int64
Commit Graph
203 Commits
Author SHA1 Message Date
Anatol Belski f166237626 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport 
* origin/PHP-5.6: (41 commits)
  fix crash in MINFO when no mysqlnd plugins are loaded
  backported some ext/intl tests from 5.6 into 5.4
  test fixes for ICU 53.1
  Fixed bug #67033 Remove reference to Windows 95
  fix NEWS
  Fixed bug #64604
  Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec
  Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
  Fix windows build
  Fix bug #66721
  fix apr_psprintf format string from e0df4e3dba
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height
  Bug #66840: Fix broken build when extension built separately
  Reverted to 5a0da281e5 Discussion: http://news.php.net/php.cvs/76836
  Forgot title in phpt for bug #67064
  Updated NEWS
  Fix bug #67064 in a BC safe way You can use an optional parameter now when implementing the Countable interface to get the $mode passed to count().
  Added UPGRAING notice for bug #66015 in BC break section
  Add new zend_hash_* APIs to UPGRADING.INTERNALS
  Add str_* macros to UPGRADING.INTERNALS
  ...

Conflicts:
	Zend/zend_compile.c
	Zend/zend_execute_API.c
	Zend/zend_language_parser.y
	ext/mysqli/mysqli.c
	ext/mysqlnd/mysqlnd.c
	ext/mysqlnd/mysqlnd.h
	ext/mysqlnd/mysqlnd_ps.c
	ext/mysqlnd/mysqlnd_result.c
	ext/mysqlnd/mysqlnd_result.h
	ext/mysqlnd/mysqlnd_structs.h
	ext/mysqlnd/mysqlnd_wireprotocol.c
	ext/mysqlnd/mysqlnd_wireprotocol.h
	ext/opcache/zend_accelerator_util_funcs.c
	ext/spl/spl_observer.c
	ext/standard/array.c
 2014-04-15 09:53:02 +02:00
Stanislav Malyshev 1be29a404a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix apr_psprintf format string from e0df4e3dba
 2014-04-13 15:39:32 -07:00
Stanislav Malyshev c5275b4a92 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix apr_psprintf format string from e0df4e3dba
 2014-04-13 15:37:55 -07:00
Jeff Trawick 442264ffd6 fix apr_psprintf format string from e0df4e3dba 2014-04-13 15:36:43 -07:00
Bob Weinand 99d1a1bb3f Shut up, my lovely compiler; I do not like your warnings 2014-04-11 19:33:56 +02:00
Anatol Belski 4ff4837966 Merge remote-tracking branch 'origin/master' into str_size_and_int64 
Conflicts:
	Zend/zend.c
	Zend/zend_ini_scanner.c
 2014-01-04 02:17:11 +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
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 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 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
Anatol Belski 52afd818eb fixed apache2 handler 2013-11-22 11:39:33 +01: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
Veres Lajos 8d86597d73 non living code related typo fixes 2013-08-04 16:05:36 -07:00
Stanislav Malyshev ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07:00
Xinchen Hui 0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Anatoliy Belsky 117d2dd688 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Enabled apache 2.4 handler build option

Conflicts:
	sapi/apache2handler/config.w32
 2012-11-13 19:40:22 +01:00
Pierre Joye 019bdff395 Enabled apache 2.4 handler build option 2012-11-13 19:34:00 +01:00
Christopher Jones 949ef40139 Fixed bug #61172 (Add Apache 2.4 support) 2012-03-02 00:07:41 +00:00
Christopher Jones 15cd45e95e Fixed bug #61172 (Add Apache 2.4 support) 2012-03-02 00:07:41 +00:00
Felipe Pena e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena 4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Xinchen Hui a391535e00 Fixed bug #60206 (possible integer overflow in content_length) 2011-11-03 07:26:09 +00:00
Xinchen Hui d4b90b4788 Fixed bug #60206 (possible integer overflow in content_length) 2011-11-03 07:26:09 +00:00
Pierre Joye fdd4aa7073 - add apache 2.3 (upcoming 2.4) handler 2011-07-06 11:13:38 +00:00
Ilia Alshanetsky 86c44e119f Fixed a bug with calculation of REQUEST_TIME in apache2 2011-06-23 14:12:50 +00:00
Felipe Pena 32b5f8a1a3 - Added new parameter parsing option (p - for valid path (string without null byte in the middle)) 
# The tests will be fixed in the next commits
 2011-06-06 21:28:16 +00:00
Felipe Pena 00169ec00f - Fixed bug #54529 (SAPI crashes on apache_config.c:197) 
patch by: hebergement at riastudio dot fr
 2011-05-23 01:47:06 +00:00
Felipe Pena a95a021509 - Fixed bug #54529 (SAPI crashes on apache_config.c:197) 
patch by: hebergement at riastudio dot fr
 2011-05-23 01:47:06 +00:00
Rasmus Lerdorf 27dd44db95 Fix a couple of warnings. Use %zu to printf a time_t and get_request_time 
actually returns a double, not a time_t.
 2011-05-16 15:52:31 +00:00
Felipe Pena 927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena 0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Ilia Alshanetsky f89effd2a8 Updated _SERVER['REQUEST_TIME'] to include microsecond precision. 2010-11-06 17:14:21 +00:00
Kalle Sommer Nielsen 34b631f679 Pass the TSRMS pointers to sapi_module_struct.log_message, this saves some TSRMLS_FETCH() calls in a few of our SAPI's 2010-08-18 13:34:40 +00:00
Michael Wallner 11d24c1593 * implement new output API, fixing some bugs and implementing some feature 
requests--let's see what I can dig out of the bugtracker for NEWS--
  and while crossing the road:
   * implemented new zlib API
   * fixed up ext/tidy (what was "s&" in zend_parse_parameters() supposed to do?)

Thanks to Jani and Felipe for pioneering.
 2010-05-31 10:29:43 +00:00
Rob Richards 60f62fc563 fix non-windows builds 2010-05-04 12:12:28 +00:00
Pierre Joye af567e7d54 - fix build 2010-05-04 09:51:03 +00:00
Pierre Joye 11040eae16 - revert fix for #51723 in 5.2, vc6 does not support strtoi64, use builtin functioon in 5.3 (trunk is vc9+ only) 2010-05-03 19:51:59 +00:00
Pierre Joye 56e327ba27 - revert fix for #51723 in 5.2, vc6 does not support strtoi64, use builtin functioon in 5.3 (trunk is vc9+ only) 2010-05-03 19:51:59 +00:00
Pierre Joye d90f8560aa - #51273, Content-length header is limited to 32bit integer with apache2/windows 2010-05-03 17:47:58 +00:00
Pierre Joye 43f4d46cb3 - #51273, Content-length header is limited to 32bit integer with apache2/windows 2010-05-03 17:47:58 +00:00
Pierre Joye 9720dea2c7 - WS 2010-05-03 14:30:14 +00:00
Pierre Joye cbe5199c42 - WS 2010-05-03 14:29:07 +00:00
Rob Richards 0a34d10783 revert change #298288: Remove old dsp/dsw/makefile files 2010-04-28 14:41:51 +00:00
Kalle Sommer Nielsen dd8e59da8f Removed safe_mode 
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
 2010-04-26 23:53:30 +00:00
Kalle Sommer Nielsen 518a17e7bf Remove old dsp/dsw/makefile files, these arent used by the build system anymore and are barely updated nor available for all extensions 2010-04-21 23:36:49 +00:00
Jani Taskinen af49e58f51 - Reverted r296062 and r296065 2010-03-12 10:28:59 +00:00