php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-23 16:08:35 +02:00
Code Issues Packages Projects Releases Wiki Activity
76,406 Commits 549 Branches 1,485 Tags
09f2355eec0b800905d59f9e96ae09d242ba7673
Commit Graph

1106 Commits

Author SHA1 Message Date
Anatol Belski 713e9a7eaa avoid clash when stdint.h was included after win32/php_stdint.h 2014-08-21 09:08:44 +02:00
Lior Kaplan be2128c805 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  typofixes
 2014-08-17 15:48:22 +03:00
Veres Lajos 3f42f2f5d1 typofixes 2014-08-17 15:44:02 +03:00
Anatol Belski 58088c24eb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  wrap int8_t and int16_t with #ifdef to avoid possible clashes
 2014-08-07 15:21:42 +02:00
Anatol Belski 7189039d65 wrap int8_t and int16_t with #ifdef to avoid possible clashes 2014-08-07 15:20:17 +02:00
Anatol Belski 6fcd8e5865 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix nmake snap when ext name is different in target dll
 2014-07-21 14:46:57 +02:00
Anatol Belski dc3a5d783f fix nmake snap when ext name is different in target dll 2014-07-21 14:45:49 +02:00
Anatol Belski 982342b057 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  implemented copy libs of core exts in phpize mode
 2014-07-18 18:40:09 +02:00
Anatol Belski c5ccaf1d04 implemented copy libs of core exts in phpize mode 2014-07-18 18:38:57 +02:00
Anatol Belski f304fb848f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix copy the ext dll into the prefix path in phpize mode
  fix default prefix in phpize mode
  fix file with zero size usage in phpize mode
 2014-07-18 11:40:53 +02:00
Anatol Belski 35b077f53e fix copy the ext dll into the prefix path in phpize mode 2014-07-18 11:39:38 +02:00
Anatol Belski 8044d0680b fix default prefix in phpize mode 2014-07-18 11:36:44 +02:00
Anatol Belski a8e0a623ec fix file with zero size usage in phpize mode 2014-07-18 11:35:32 +02:00
Anatol Belski b5324acd35 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  implemented usage of the non core ext deps in phpize mode
 2014-07-17 21:48:46 +02:00
Anatol Belski f0a1e410a3 implemented usage of the non core ext deps in phpize mode 2014-07-17 21:47:15 +02:00
Anatol Belski 1a2c3bd3ad Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  implemented force usage of generated .h and .js deps in phpize mode
 2014-07-17 09:26:46 +02:00
Anatol Belski b3c6089111 implemented force usage of generated .h and .js deps in phpize mode 2014-07-17 09:25:57 +02:00
Anatol Belski 7446c81aed Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  basic routines for phpize mode to
 2014-07-16 21:34:19 +02:00
Anatol Belski ce2ad0df18 basic routines for phpize mode to 
- generate headers for non core ext defines
- generate js deps for non core exts
 2014-07-16 21:33:07 +02:00
Anatol Belski 79b91e3c5a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  added headers install to phpize mode
 2014-07-14 09:53:16 +02:00
Anatol Belski 04821a1ee6 added headers install to phpize mode 2014-07-14 09:52:39 +02:00
Anatol Belski b10ed89dac Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix makefile in phpize mode
 2014-07-11 15:06:56 +02:00
Anatol Belski ae313b6037 fix makefile in phpize mode 
- extend LDFLAGS with dynamically generated ones
- prevend dynamically generated CFLAGS to be overridden by hardcoded ones
 2014-07-11 15:05:01 +02:00
Anatol Belski f3d565f6ac Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixe output_as_table() when no ext was enabled
 2014-07-11 09:37:19 +02:00
Anatol Belski 9f5cf7d41a fixe output_as_table() when no ext was enabled 2014-07-11 09:36:44 +02:00
Anatol Belski efcc789ef8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix end of stream exception when generating makefile
 2014-07-10 22:34:55 +02:00
Anatol Belski 02b661ecfc fix end of stream exception when generating makefile 2014-07-10 22:33:55 +02:00
Anatol Belski cc67cf6322 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  force ext_dep.js prepend to configure.js in phpize mode
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update to LSAPI 6.6
  Update LiteSpeed SAPI code to V6.4
 2014-07-10 21:51:32 +02:00
Anatol Belski 1f90dd3359 force ext_dep.js prepend to configure.js in phpize mode 2014-07-10 21:50:37 +02:00
Anatol Belski ec6b367722 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  turn off PGO in phpize mode
  Fixed typo in Makefile.frag
 2014-07-10 19:36:04 +02:00
Anatol Belski e2b0d97950 turn off PGO in phpize mode 2014-07-10 19:35:26 +02:00
Anatol Belski 131e60ce56 Merge branch 'PHP-5.4' into PHP-5.5 2014-07-02 11:35:42 +02:00
Anatol Belski 5efda71e54 bundle deplister.exe with releases 2014-07-02 11:34:37 +02:00
Anatol Belski 49e175be42 backported the VC12 fix for ARG_MAX 2014-07-02 11:11:39 +02:00
Anatol Belski 5d687afa89 updated libs_version.txt 2014-07-01 10:34:25 +02:00
Anatol Belski 6081dd781a updated libs_version.txt 2014-07-01 10:33:09 +02:00
Lior Kaplan d2bdedbcfc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update copyright year to 2014
  Update copyright year to 2014
 2014-06-18 00:11:35 +03:00
Lior Kaplan 4106d48d1c Update copyright year to 2014 2014-06-17 23:57:20 +03:00
Anatol Belski 7a71f5d112 updated libs versions 2014-04-08 11:42:58 +02:00
Anatol Belski 972c451c73 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update lib versions

Conflicts:
	win32/build/libs_version.txt
 2014-03-27 18:19:24 +01:00
Anatol Belski 1283722589 update lib versions 2014-03-27 18:18:06 +01:00
Anatol Belski 7477f5b387 fix disabling PGO for extensions, rel bug #65715 2014-03-25 06:44:54 +01:00
Anatol Belski 223f7d9a44 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  more fixes related to bug #65715
 2014-03-24 19:18:39 +01:00
Anatol Belski 6612e1ba6a more fixes related to bug #65715 2014-03-24 19:15:02 +01:00
Anatol Belski 76066b304c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
  Fixed bug #65715 php5embed.lib isn't provided anymore
 2014-03-24 10:28:48 +01:00
Anatol Belski 17a57ad980 Fixed bug #65715 php5embed.lib isn't provided anymore 2014-03-24 10:24:37 +01:00
Anatol Belski f7b9c12ed9 updated libs_version.txt 2014-03-13 10:28:04 +01:00
Pierre Joye d2e42d5372 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix #66872, invalid argument crashes gmp_testbit
  fix #66872, invalid argument crashes gmp_testbit
  add vc12 (2013)

Conflicts:
	win32/build/confutils.js
 2014-03-10 12:10:57 +01:00
Pierre Joye b084157d3d Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
# By Anatol Belski (38) and others
# Via Anatol Belski (23) and others
* 'PHP-5.5' of git.php.net:php-src: (325 commits)
  NEWS
  NEWS
  Fixed Bug #66820 out-of-bounds memory access in fileinfo
  Improves fix for memory leak, keep in sync with upstream.
  Fixed news for #60602
  Updated news for #60602
  proc_open(): separate environment values that aren't strings
  Fixed NEWS.
  Updated news for #66535 and #66109
  Updated NEWS for #66535
  don't compare constants on run time
  substr_compare(): Allow zero length comparison
  Fixed test case title
  [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
  Fixed expected output of a few cURL test cases
  Allow NULL as value for CURLOPT_CUSTOMREQUEST option.
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
  typo spotted by Lajos Veres
  update libs_version.txt
  ...
 2014-03-05 10:37:04 +01:00
Pierre Joye e590aceb5a Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 
# By Anatol Belski (22) and others
# Via Derick Rethans (5) and others
* 'PHP-5.4' of git.php.net:php-src: (176 commits)
  NEWS
  Fixed Bug #66820 out-of-bounds memory access in fileinfo
  Improves fix for memory leak, keep in sync with upstream.
  Updated news for #60602
  proc_open(): separate environment values that aren't strings
  Updated NEWS for #66535
  Fixed test case title
  [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
  NEWS
  test for bug #66762
  Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed
  fix tests broken by 633f898f15
  add news entry
  add clear_env option to FPM config
  Reduce test noise on cross Oracle client <-> server version tests. This fix is already in PHP 5.6+
  Reduce test noise in cross Oracle client <-> server version testing. This change is already in PHP 5.6+
  fixed macro
  Make sure value is initialized
  ...
 2014-03-05 10:32:42 +01:00